From dd56c86735061dfed37651fcd9ec399ecf033f5b Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 20 Apr 2023 18:41:05 +0000 Subject: [PATCH] fix(enterprise/replicasync): Avoid deadlock during Close^2 --- enterprise/replicasync/replicasync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enterprise/replicasync/replicasync.go b/enterprise/replicasync/replicasync.go index 6f8c25a65cc49..4b31b912ea673 100644 --- a/enterprise/replicasync/replicasync.go +++ b/enterprise/replicasync/replicasync.go @@ -371,8 +371,8 @@ func (m *Manager) Close() error { } close(m.closed) m.closeCancel() - m.closeWait.Wait() m.closeMutex.Unlock() + m.closeWait.Wait() m.mutex.Lock() defer m.mutex.Unlock() ctx, cancelFunc := context.WithTimeout(context.Background(), 5*time.Second)