MB-37589: Prioritise rebalance runnnig check over another DDL check

Change-Id: I390e1cbbb06694a8a6cb21f7b20a7b30947bf5b7
couchbase · Aug 24, 2020 · 6a65b2a · 6a65b2a
1 parent 52769ab
commit 6a65b2a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/secondary/manager/lifecycle.go b/secondary/manager/lifecycle.go
@@ -510,6 +510,15 @@ func (m *LifecycleMgr) handlePrepareCreateIndex(content []byte) ([]byte, error)
 	}
 
 	if prepareCreateIndex.Op == client.PREPARE {
+		if _, err := m.repo.GetLocalValue("RebalanceRunning"); err == nil {
+			logging.Infof("LifecycleMgr.handlePrepareCreateIndex() : Reject %v because rebalance in progress", prepareCreateIndex.DefnId)
+			response := &client.PrepareCreateResponse{
+				Accept: false,
+				Msg:    client.RespRebalanceRunning,
+			}
+			return client.MarshallPrepareCreateResponse(response)
+		}
+
 		if m.prepareLock != nil {
 			if m.prepareLock.RequesterId != prepareCreateIndex.RequesterId ||
 				m.prepareLock.DefnId != prepareCreateIndex.DefnId {
@@ -527,15 +536,6 @@ func (m *LifecycleMgr) handlePrepareCreateIndex(content []byte) ([]byte, error)
 			}
 		}
 
-		if _, err := m.repo.GetLocalValue("RebalanceRunning"); err == nil {
-			logging.Infof("LifecycleMgr.handlePrepareCreateIndex() : Reject %v because rebalance in progress", prepareCreateIndex.DefnId)
-			response := &client.PrepareCreateResponse{
-				Accept: false,
-				Msg:    client.RespRebalanceRunning,
-			}
-			return client.MarshallPrepareCreateResponse(response)
-		}
-
 		m.prepareLock = prepareCreateIndex
 		m.prepareLock.StartTime = time.Now().UnixNano()