mvcc: fix deadlock

etcd-io · Apr 26, 2020 · 784d04a · 784d04a
1 parent 0461b3f
commit 784d04a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go
@@ -145,14 +145,14 @@ func NewStore(lg *zap.Logger, b backend.Backend, le lease.Lessor, ci cindex.Cons
 
 func (s *store) compactBarrier(ctx context.Context, ch chan struct{}) {
 	if ctx == nil || ctx.Err() != nil {
-		s.mu.Lock()
 		select {
 		case <-s.stopc:
 		default:
+			s.mu.Lock()
 			f := func(ctx context.Context) { s.compactBarrier(ctx, ch) }
 			s.fifoSched.Schedule(f)
+			s.mu.Unlock()
 		}
-		s.mu.Unlock()
 		return
 	}
 	close(ch)