wip

ydb-platform · Jan 22, 2025 · 7a95777 · 7a95777
1 parent 3c8d8b3
commit 7a95777
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/pkg/rolling/restart_handler.go b/pkg/rolling/restart_handler.go
@@ -89,14 +89,11 @@ func (rh *restartHandler) run() {
 	}
 }
 
-func (rh *restartHandler) stopWithDelay() {
-	close(rh.queue)
-	rh.wg.Wait()
-	close(rh.done)
-}
-
-func (rh *restartHandler) stopRightNow() {
+func (rh *restartHandler) stop(shouldWaitForDelay bool) {
 	close(rh.queue)
+	if shouldWaitForDelay {
+		rh.wg.Wait()
+	}
 	close(rh.done)
 }
 

diff --git a/pkg/rolling/rolling.go b/pkg/rolling/rolling.go
@@ -371,15 +371,12 @@ func (r *Rolling) processActionGroupStates(actions []*Ydb_Maintenance.ActionGrou
 	r.logCompleteResult(result)
 	r.state.unreportedButFinishedActionIds = []string{}
 
-	isRestartCompleted := len(actions) == len(result.ActionStatuses)
+	restartCompleted := len(actions) == len(result.ActionStatuses)
+	shouldWaitForDelay := !restartCompleted
 
-	if !isRestartCompleted {
-		restartHandler.stopWithDelay()
-	} else {
-		restartHandler.stopRightNow()
-	}
+	restartHandler.stop(shouldWaitForDelay)
 
-	return isRestartCompleted
+	return restartCompleted
 }
 
 func (r *Rolling) atomicHasActionInUnreported(actionID string) bool {