agent: maintenance mode is persistent

command/agent/agent.go

@@ -1031,7 +1031,7 @@ func (a *Agent) EnableServiceMaintenance(serviceID string) error {
 		ServiceName: service.Service,
 		Status:      structs.HealthCritical,
 	}
-	a.state.AddCheck(check)
+	a.AddCheck(check, nil, true)
 
 	return nil
 }
@@ -1061,7 +1061,7 @@ func (a *Agent) DisableServiceMaintenance(serviceID string) error {
 
 DEREGISTER:
 	// Deregister the maintenance check
-	a.state.RemoveCheck(maintCheckID)
+	a.RemoveCheck(maintCheckID, true)
 
 	return nil
 }