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

debugging gc

Browse Source
This commit is contained in:
Chao Xu 2016-08-09 15:55:15 -07:00
parent d836b248b2
commit 9ac91e5172
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/make-rules/test-integration.sh
View File

@ -62,6 +62,7 @@ runTests() {
make -C "${KUBE_ROOT}" test \ make -C "${KUBE_ROOT}" test \
WHAT="$(kube::test::find_integration_test_dirs | paste -sd' ' -)" \ WHAT="$(kube::test::find_integration_test_dirs | paste -sd' ' -)" \
KUBE_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \ KUBE_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \
KUBE_TEST_ARGS="--vmodule=garbage*collector=6" \
KUBE_RACE="" \ KUBE_RACE="" \
KUBE_TIMEOUT="${KUBE_TIMEOUT}" \ KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
KUBE_TEST_API_VERSIONS="$1" KUBE_TEST_API_VERSIONS="$1"

1
pkg/controller/garbagecollector/garbagecollector.go
View File

@ -504,7 +504,6 @@ func (gc *GarbageCollector) monitorFor(resource unversioned.GroupVersionResource
}, },
UpdateFunc: func(oldObj, newObj interface{}) { UpdateFunc: func(oldObj, newObj interface{}) {
setObjectTypeMeta(newObj) setObjectTypeMeta(newObj)
setObjectTypeMeta(oldObj)
event := &event{updateEvent, newObj, oldObj} event := &event{updateEvent, newObj, oldObj}
gc.propagator.eventQueue.Add(&workqueue.TimedWorkQueueItem{StartTime: gc.clock.Now(), Object: event}) gc.propagator.eventQueue.Add(&workqueue.TimedWorkQueueItem{StartTime: gc.clock.Now(), Object: event})
}, },

5
test/integration/garbagecollector/garbage_collector_test.go
View File

@ -27,6 +27,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/golang/glog"
dto "github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors" "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. // This test simulates the cascading deletion.
func TestCascadingDeletion(t *testing.T) { func TestCascadingDeletion(t *testing.T) {
glog.V(6).Infof("TestCascadingDeletion starts")
defer glog.V(6).Infof("TestCascadingDeletion ends")
s, gc, clientSet := setup(t) s, gc, clientSet := setup(t)
defer s.Close() 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 // 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. // doesn't exist. It verifies the GC will delete such an object.
func TestCreateWithNonExistentOwner(t *testing.T) { func TestCreateWithNonExistentOwner(t *testing.T) {
glog.V(6).Infof("TestCreateWithNonExistentOwner starts")
defer glog.V(6).Infof("TestCreateWithNonExistentOwner ends")
s, gc, clientSet := setup(t) s, gc, clientSet := setup(t)
defer s.Close() defer s.Close()