From 6db618fa4274743edcd9c165b0f6cebb690644dc Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Mon, 1 Jul 2019 21:26:32 +0800 Subject: [PATCH] Move population of expectedUIDs outside lock --- pkg/controller/controller_utils.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index eab615c16f4..044f6b8e6dd 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -337,17 +337,17 @@ func (u *UIDTrackingControllerExpectations) GetUIDs(controllerKey string) sets.S // ExpectDeletions records expectations for the given deleteKeys, against the given controller. func (u *UIDTrackingControllerExpectations) ExpectDeletions(rcKey string, deletedKeys []string) error { + expectedUIDs := sets.NewString() + for _, k := range deletedKeys { + expectedUIDs.Insert(k) + } + klog.V(4).Infof("Controller %v waiting on deletions for: %+v", rcKey, deletedKeys) u.uidStoreLock.Lock() defer u.uidStoreLock.Unlock() if existing := u.GetUIDs(rcKey); existing != nil && existing.Len() != 0 { klog.Errorf("Clobbering existing delete keys: %+v", existing) } - expectedUIDs := sets.NewString() - for _, k := range deletedKeys { - expectedUIDs.Insert(k) - } - klog.V(4).Infof("Controller %v waiting on deletions for: %+v", rcKey, deletedKeys) if err := u.uidStore.Add(&UIDSet{expectedUIDs, rcKey}); err != nil { return err }