github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

use an aggressive delete option when deleting pods in the pod garbage collector

Browse Source
This commit is contained in:
Mike Danese
2015-10-09 17:15:00 -07:00
parent 273c9ce503
commit 66ddde9fea
2 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
pkg/controller/gc/gc_controller_test.go
View File

@@ -25,41 +25,9 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/testclient"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/sets"
)
type FakePodControl struct {
podSpec []api.PodTemplateSpec
deletePodName []string
lock sync.Mutex
err error
}
func (f *FakePodControl) CreatePods(namespace string, spec *api.PodTemplateSpec, object runtime.Object) error {
panic("unimplemented")
}
func (f *FakePodControl) CreatePodsOnNode(nodeName, namespace string, spec *api.PodTemplateSpec, object runtime.Object) error {
panic("unimplemented")
}
func (f *FakePodControl) DeletePod(namespace string, podName string) error {
f.lock.Lock()
defer f.lock.Unlock()
if f.err != nil {
return f.err
}
f.deletePodName = append(f.deletePodName, podName)
return nil
}
func (f *FakePodControl) clear() {
f.lock.Lock()
defer f.lock.Unlock()
f.deletePodName = []string{}
f.podSpec = []api.PodTemplateSpec{}
}
func TestGC(t *testing.T) {
type nameToPhase struct {
name string
@@ -100,8 +68,14 @@ func TestGC(t *testing.T) {
for i, test := range testCases {
client := testclient.NewSimpleFake()
gcc := New(client, controller.NoResyncPeriodFunc, test.threshold)
fake := &FakePodControl{}
gcc.podControl = fake
deletedPodNames := make([]string, 0)
var lock sync.Mutex
gcc.deletePod = func(_, name string) error {
lock.Lock()
defer lock.Unlock()
deletedPodNames = append(deletedPodNames, name)
return nil
}
creationTime := time.Unix(0, 0)
for _, pod := range test.pods {
@@ -115,16 +89,16 @@ func TestGC(t *testing.T) {
gcc.gc()
pass := true
for _, pod := range fake.deletePodName {
for _, pod := range deletedPodNames {
if !test.deletedPodNames.Has(pod) {
pass = false
}
}
if len(fake.deletePodName) != len(test.deletedPodNames) {
if len(deletedPodNames) != len(test.deletedPodNames) {
pass = false
}
if !pass {
t.Errorf("[%v]pod's deleted expected and actual did not match.\n\texpected: %v\n\tactual: %v", i, test.deletedPodNames, fake.deletePodName)
t.Errorf("[%v]pod's deleted expected and actual did not match.\n\texpected: %v\n\tactual: %v", i, test.deletedPodNames, deletedPodNames)
}
}
}