diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index c5b04750d80..9737c642daf 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -62,6 +62,7 @@ runTests() { make -C "${KUBE_ROOT}" test \ WHAT="$(kube::test::find_integration_test_dirs | paste -sd' ' -)" \ KUBE_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \ + KUBE_TEST_ARGS="--vmodule=garbage*collector=6" \ KUBE_RACE="" \ KUBE_TIMEOUT="${KUBE_TIMEOUT}" \ KUBE_TEST_API_VERSIONS="$1" diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index c4fb6228930..dbe4f30d689 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -504,7 +504,6 @@ func (gc *GarbageCollector) monitorFor(resource unversioned.GroupVersionResource }, UpdateFunc: func(oldObj, newObj interface{}) { setObjectTypeMeta(newObj) - setObjectTypeMeta(oldObj) event := &event{updateEvent, newObj, oldObj} gc.propagator.eventQueue.Add(&workqueue.TimedWorkQueueItem{StartTime: gc.clock.Now(), Object: event}) }, diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index 91514294c1b..25a8205f90a 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -27,6 +27,7 @@ import ( "testing" "time" + "github.com/golang/glog" dto "github.com/prometheus/client_model/go" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" @@ -144,6 +145,8 @@ func setup(t *testing.T) (*httptest.Server, *garbagecollector.GarbageCollector, // This test simulates the cascading deletion. func TestCascadingDeletion(t *testing.T) { + glog.V(6).Infof("TestCascadingDeletion starts") + defer glog.V(6).Infof("TestCascadingDeletion ends") s, gc, clientSet := setup(t) defer s.Close() @@ -251,6 +254,8 @@ func TestCascadingDeletion(t *testing.T) { // This test simulates the case where an object is created with an owner that // doesn't exist. It verifies the GC will delete such an object. func TestCreateWithNonExistentOwner(t *testing.T) { + glog.V(6).Infof("TestCreateWithNonExistentOwner starts") + defer glog.V(6).Infof("TestCreateWithNonExistentOwner ends") s, gc, clientSet := setup(t) defer s.Close()