update maintenance check to passing before removing

Without this update service using `consul watch` to monitor check changes will never see maintenance mode being disabled. Resolves: hashicorp#11330 Signed-off-by: Jakub Sokołowski <[email protected]>
status-im · May 2, 2024 · 61317d8 · 61317d8
1 parent bbd8080
commit 61317d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.changelog/11332.txt b/.changelog/11332.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+agent: update maintenance check to passing before removing
+```
diff --git a/agent/agent.go b/agent/agent.go
@@ -4234,6 +4234,10 @@ func (a *Agent) DisableServiceMaintenance(serviceID structs.ServiceID) error {
 		return nil
 	}
 
+	// Update check to trigger an event for watchers
+	a.State.UpdateCheck(checkID, api.HealthPassing, "")
+	// Make sure state change is propagated
+	a.State.SyncChanges()
 	// Deregister the maintenance check
 	a.RemoveCheck(checkID, true)
 	a.logger.Info("Service left maintenance mode", "service", serviceID.String())
@@ -4271,6 +4275,10 @@ func (a *Agent) DisableNodeMaintenance() {
 	if a.State.Check(structs.NodeMaintCheckID) == nil {
 		return
 	}
+	// Update check to trigger an event for watchers
+	a.State.UpdateCheck(structs.NodeMaintCheckID, api.HealthPassing, "")
+	// Make sure state change is propagated
+	a.State.SyncChanges()
 	a.RemoveCheck(structs.NodeMaintCheckID, true)
 	a.logger.Info("Node left maintenance mode")
 }