Skip to content

Commit

Permalink
fix: Revert "enhance: avoid the coexistence of the old coordinator an…
Browse files Browse the repository at this point in the history
…d the new node/proxy (#35760)" (#36114)

issue: #36100
pr: #36113
This reverts commit 50ec3dd.

Signed-off-by: Wei Liu <[email protected]>
  • Loading branch information
weiliu1031 authored Sep 9, 2024
1 parent 9fe846c commit 14fe321
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions cmd/roles/roles.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,35 +431,6 @@ func (mr *MilvusRoles) Run() {
componentMap[typeutil.QueryCoordRole] = queryCoord
}

waitCoordBecomeHealthy := func() {
for {
select {
case <-ctx.Done():
log.Info("wait all coord become healthy loop quit")
return
default:
rcState := rootCoord.Health(ctx)
dcState := dataCoord.Health(ctx)
icState := indexCoord.Health(ctx)
qcState := queryCoord.Health(ctx)

if rcState == commonpb.StateCode_Healthy && dcState == commonpb.StateCode_Healthy && icState == commonpb.StateCode_Healthy && qcState == commonpb.StateCode_Healthy {
log.Info("all coord become healthy")
return
}
log.Info("wait all coord become healthy", zap.String("rootCoord", rcState.String()), zap.String("dataCoord", dcState.String()), zap.String("indexCoord", icState.String()), zap.String("queryCoord", qcState.String()))
time.Sleep(time.Second)
}
}
}

// In standalone mode, block the start process until the new coordinator is active to avoid the coexistence of the old coordinator and the new node/proxy
// 1. In the start/restart process, the new coordinator will become active immediately and will not be blocked
// 2. In the rolling upgrade process, the new coordinator will not be active until the old coordinator is down, and it will be blocked
if mr.Local {
waitCoordBecomeHealthy()
}

if mr.EnableQueryNode {
queryNode = mr.runQueryNode(ctx, local, &wg)
componentMap[typeutil.QueryNodeRole] = queryNode
Expand Down

0 comments on commit 14fe321

Please sign in to comment.