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
Show Stats 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 { if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} else { } 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.") glog.V(4).Infof("GC'ing unscheduled pods which are terminating.")
for _, pod := range pods { for _, pod := range pods {
if pod.DeletionTimestamp == nil { if pod.DeletionTimestamp == nil || len(pod.Spec.NodeName) > 0 {
continue
}
if len(pod.Spec.NodeName) > 0 {
continue continue
} }
@ -206,7 +202,7 @@ func (gcc *PodGCController) gcUnscheduledTerminating(pods []*api.Pod) {
if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil { if err := gcc.deletePod(pod.Namespace, pod.Name); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)
} else { } 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)
} }
} }
} }

5
pkg/controller/podgc/gc_controller_test.go
View File

@ -226,10 +226,12 @@ func TestGCUnscheduledTerminating(t *testing.T) {
} }
testCases := []struct { testCases := []struct {
name string
pods []nameToPhase pods []nameToPhase
deletedPodNames sets.String deletedPodNames sets.String
}{ }{
{ {
name: "Unscheduled pod in any phase must be deleted",
pods: []nameToPhase{ pods: []nameToPhase{
{name: "a", phase: api.PodFailed, deletionTimeStamp: &unversioned.Time{}, nodeName: ""}, {name: "a", phase: api.PodFailed, deletionTimeStamp: &unversioned.Time{}, nodeName: ""},
{name: "b", phase: api.PodSucceeded, deletionTimeStamp: &unversioned.Time{}, nodeName: ""}, {name: "b", phase: api.PodSucceeded, deletionTimeStamp: &unversioned.Time{}, nodeName: ""},
@ -238,6 +240,7 @@ func TestGCUnscheduledTerminating(t *testing.T) {
deletedPodNames: sets.NewString("a", "b", "c"), deletedPodNames: sets.NewString("a", "b", "c"),
}, },
{ {
name: "Scheduled pod in any phase must not be deleted",
pods: []nameToPhase{ pods: []nameToPhase{
{name: "a", phase: api.PodFailed, deletionTimeStamp: nil, nodeName: ""}, {name: "a", phase: api.PodFailed, deletionTimeStamp: nil, nodeName: ""},
{name: "b", phase: api.PodSucceeded, deletionTimeStamp: nil, nodeName: "node"}, {name: "b", phase: api.PodSucceeded, deletionTimeStamp: nil, nodeName: "node"},
@ -292,7 +295,7 @@ func TestGCUnscheduledTerminating(t *testing.T) {
pass = false pass = false
} }
if !pass { if !pass {
t.Errorf("[%v]pod's deleted expected and actual did not match.\n\texpected: %v\n\tactual: %v", i, test.deletedPodNames, deletedPodNames) t.Errorf("[%v]pod's deleted expected and actual did not match.\n\texpected: %v\n\tactual: %v, test: %v", i, test.deletedPodNames, deletedPodNames, test.name)
} }
} }
} }