github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

addressing comments.

Browse Source
This commit is contained in:
Anirudh
2016-10-27 13:30:04 -07:00
parent c0d116c419
commit 1ae1a19e7b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/podgc/gc_controller.go
View File

@@ -184,7 +184,7 @@ func (gcc *PodGCController) gcOrphaned(pods []*api.Pod) {
if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil {
utilruntime.HandleError(err)
} else {
glog.V(4).Infof("Forced deletion of orphaned Pod %s succeeded", pod.Name)
glog.V(0).Infof("Forced deletion of orphaned Pod %s succeeded", pod.Name)
}
}
}
@@ -194,11 +194,7 @@ func (gcc *PodGCController) gcUnscheduledTerminating(pods []*api.Pod) {
glog.V(4).Infof("GC'ing unscheduled pods which are terminating.")
for _, pod := range pods {
if pod.DeletionTimestamp == nil {
continue
}
if len(pod.Spec.NodeName) > 0 {
if pod.DeletionTimestamp == nil || len(pod.Spec.NodeName) > 0 {
continue
}
@@ -206,7 +202,7 @@ func (gcc *PodGCController) gcUnscheduledTerminating(pods []*api.Pod) {
if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil {
utilruntime.HandleError(err)
} else {
glog.V(4).Infof("Forced deletion of unscheduled terminating Pod %s succeeded", pod.Name)
glog.V(0).Infof("Forced deletion of unscheduled terminating Pod %s succeeded", pod.Name)
}
}
}