Try to fix the upgrade bug

Author: swiatekm

internal/pkg/agent/application/upgrade/rollback.go

@@ -44,6 +44,7 @@ type RollbackSettings struct {
 	skipCleanup    bool
 	skipRestart    bool
 	preRestartHook RollbackHook
+	removeMarker   bool
 }
 
 func newRollbackSettings(opts ...RollbackOpt) *RollbackSettings {
@@ -68,6 +69,10 @@ func (r *RollbackSettings) SetPreRestartHook(preRestartHook RollbackHook) {
 	r.preRestartHook = preRestartHook
 }
 
+func (r *RollbackSettings) SetRemoveMarker(removeMarker bool) {
+	r.removeMarker = removeMarker
+}
+
 func RollbackWithOpts(ctx context.Context, log *logger.Logger, c client.Client, topDirPath string, prevVersionedHome string, prevHash string, opts ...RollbackOpt) error {
 
 	settings := newRollbackSettings(opts...)
@@ -122,7 +127,7 @@ func RollbackWithOpts(ctx context.Context, log *logger.Logger, c client.Client,
 	}
 
 	// cleanup everything except version we're rolling back into
-	return Cleanup(log, topDirPath, prevVersionedHome, prevHash, false, true)
+	return Cleanup(log, topDirPath, prevVersionedHome, prevHash, settings.removeMarker, true)
 }
 
 // Cleanup removes all artifacts and files related to a specified version.

internal/pkg/agent/application/upgrade/rollback_opts.go

@@ -16,6 +16,7 @@ type RollbackOptionSetter interface {
 	SetSkipCleanup(skipCleanup bool)
 	SetSkipRestart(skipRestart bool)
 	SetPreRestartHook(preRestartHook RollbackHook)
+	SetRemoveMarker(removeMarker bool)
 }
 
 type RollbackOption func(ros RollbackOptionSetter)

internal/pkg/agent/cmd/watch.go

@@ -13,6 +13,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	semver "github.com/elastic/elastic-agent/pkg/version"
+
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/logp/configure"
 	"github.com/elastic/elastic-agent/pkg/control/v2/client"
@@ -215,7 +217,17 @@ func watchCmd(log *logp.Logger, topDir string, cfg *configuration.UpgradeWatcher
 		log.Error("Error detected, proceeding to rollback: %v", err)
 
 		upgradeDetails.SetStateWithReason(details.StateRollback, details.ReasonWatchFailed)
-		err = installModifier.Rollback(ctx, log, client.New(), paths.Top(), marker.PrevVersionedHome, marker.PrevHash)
+		var opts []upgrade.RollbackOption
+		previousVersion, versionParseErr := semver.ParseVersion(marker.PrevVersion)
+		if versionParseErr != nil {
+			return fmt.Errorf("could not parse previous version %s: %w", marker.PrevVersion, versionParseErr)
+		}
+		if previousVersion.Less(*semver.NewParsedSemVer(9, 2, 0, "", "")) {
+			opts = append(opts, func(ros upgrade.RollbackOptionSetter) {
+				ros.SetRemoveMarker(true)
+			})
+		}
+		err = installModifier.Rollback(ctx, log, client.New(), paths.Top(), marker.PrevVersionedHome, marker.PrevHash, opts...)
 		if err != nil {
 			log.Error("rollback failed", err)
 			upgradeDetails.Fail(err)