Check upgrade details state before allowing a manual rollback

pchila · pchila · commit f05a783e904b · 2025-09-16T19:47:58.000+02:00
diff --git a/internal/pkg/agent/application/coordinator/coordinator.go b/internal/pkg/agent/application/coordinator/coordinator.go
@@ -748,8 +748,8 @@ func (c *Coordinator) Upgrade(ctx context.Context, version string, sourceURI str
 	var err error
 	for i := 0; i < 5; i++ {
 		s := c.State()
-		// if we are not already upgrading or if the incoming is a rollback request we can continue processing
-		if s.State != agentclient.Upgrading || uOpts.rollback {
+		// if we are not already upgrading or if the incoming is a rollback request while the watcher is running, we can continue processing
+		if s.State != agentclient.Upgrading || (uOpts.rollback && s.UpgradeDetails != nil && s.UpgradeDetails.State == details.StateWatching) {
 			err = nil
 			break
 		}
