diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 4cc4a854d4..749cf0d6e2 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -68,7 +68,7 @@ func (s objectReference) String() string { type node struct { identity objectReference // dependents will be read by the orphan() routine, we need to protect it with a lock. - dependentsLock *sync.RWMutex + dependentsLock sync.RWMutex dependents map[*node]struct{} // When processing an Update event, we need to compare the updated // ownerReferences with the owners recorded in the graph. @@ -152,8 +152,7 @@ func (p *Propagator) addDependentToOwners(n *node, owners []metatypes.OwnerRefer OwnerReference: owner, Namespace: n.identity.Namespace, }, - dependentsLock: &sync.RWMutex{}, - dependents: make(map[*node]struct{}), + dependents: make(map[*node]struct{}), } glog.V(6).Infof("add virtual node.identity: %s\n\n", ownerNode.identity) p.uidToNode.Write(ownerNode) @@ -380,9 +379,8 @@ func (p *Propagator) processEvent() { }, Namespace: accessor.GetNamespace(), }, - dependentsLock: &sync.RWMutex{}, - dependents: make(map[*node]struct{}), - owners: accessor.GetOwnerReferences(), + dependents: make(map[*node]struct{}), + owners: accessor.GetOwnerReferences(), } p.insertNode(newNode) // the underlying delta_fifo may combine a creation and deletion into one event diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index 009fa5a562..e9502e2765 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -314,7 +314,7 @@ func TestDependentsRace(t *testing.T) { } const updates = 100 - owner := &node{dependentsLock: &sync.RWMutex{}, dependents: make(map[*node]struct{})} + owner := &node{dependents: make(map[*node]struct{})} ownerUID := types.UID("owner") gc.propagator.uidToNode.Write(owner) go func() {