pkg/controller/garbagecollector: simplify mutexes.

Similar to #29598, we can rely on the zero-value construction behavior
to embed `sync.Mutex` into parent structs.
pull/6/head
Matt T. Proud 2016-08-02 08:13:17 +02:00
parent 37d3d390df
commit 1ca99119fd
2 changed files with 5 additions and 7 deletions

View File

@ -67,7 +67,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.
@ -151,8 +151,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{}),
}
p.uidToNode.Write(ownerNode)
p.gc.dirtyQueue.Add(ownerNode)
@ -378,9 +377,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

View File

@ -301,7 +301,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() {