wire agent install source at startup

Author: pchila

internal/pkg/agent/application/application.go

@@ -12,6 +12,7 @@ import (
 
 	"go.elastic.co/apm/v2"
 
+	v1 "github.com/elastic/elastic-agent/pkg/api/v1"
 	"github.com/elastic/elastic-agent/pkg/utils/install"
 	"github.com/elastic/go-ucfg"
 
@@ -64,7 +65,7 @@ func New(
 	fleetInitTimeout time.Duration,
 	disableMonitoring bool,
 	override CfgOverrider,
-	initialUpgradeDetails *details.Details,
+	initialUpdateMarker *upgrade.UpdateMarker,
 	modifiers ...component.PlatformModifier,
 ) (*coordinator.Coordinator, coordinator.ConfigManager, composable.Controller, error) {
 
@@ -124,9 +125,39 @@ func New(
 		override(cfg)
 	}
 
+	var installDescriptorSource *install.FileDescriptorSource = nil
+
+	installDescriptorSource = install.NewFileDescriptorSource(filepath.Join(paths.Top(), paths.MarkerFileName))
+	if platform.OS != component.Container {
+		if initialUpdateMarker != nil && initialUpdateMarker.Details != nil && initialUpdateMarker.Details.State == details.StateRollback {
+			// Take the versionedHome of the version we rolledback from and remove it from the installation lists
+			_, removeInstallDescErr := installDescriptorSource.RemoveAgentInstallDesc(initialUpdateMarker.VersionedHome /* there should be the versionedHome from the upgrade marker here*/)
+			if removeInstallDescErr != nil {
+				log.Warnf("Error removing rolled back version %s installed in %s: %v", initialUpdateMarker.VersionedHome, initialUpdateMarker.VersionedHome, removeInstallDescErr)
+			}
+
+			currentVersionedHome, _ := filepath.Rel(paths.Top(), paths.Home())
+			// Set the current version as active and all the others as inactive
+			_, updateInstallDescErr := installDescriptorSource.ModifyInstallDesc(func(desc *v1.AgentInstallDesc) error {
+				if desc.VersionedHome == currentVersionedHome {
+					// set the current version as active and make sure it doesn't have a TTL
+					desc.Active = true
+					desc.TTL = nil
+				} else {
+					// any other install is not the active one
+					desc.Active = false
+				}
+				return nil
+			})
+			if updateInstallDescErr != nil {
+				log.Warnf("Error removing rolled back version %s installed in %s")
+			}
+		}
+	}
+
 	// monitoring is not supported in bootstrap mode https://github.com/elastic/elastic-agent/issues/1761
 	isMonitoringSupported := !disableMonitoring && cfg.Settings.V1MonitoringEnabled
-	upgrader, err := upgrade.NewUpgrader(log, cfg.Settings.DownloadConfig, cfg.Settings.Upgrade, agentInfo, new(upgrade.AgentWatcherHelper), install.NewFileDescriptorSource(filepath.Join(paths.Top(), paths.MarkerFileName)))
+	upgrader, err := upgrade.NewUpgrader(log, cfg.Settings.DownloadConfig, cfg.Settings.Upgrade, agentInfo, new(upgrade.AgentWatcherHelper), installDescriptorSource)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("failed to create upgrader: %w", err)
 	}
@@ -144,6 +175,12 @@ func New(
 		return nil, nil, nil, fmt.Errorf("failed to initialize runtime manager: %w", err)
 	}
 
+	// prepare initialUpgradeDetails for injecting it in coordinator later on
+	var initialUpgradeDetails *details.Details
+	if initialUpdateMarker != nil && initialUpdateMarker.Details != nil {
+		initialUpgradeDetails = initialUpdateMarker.Details
+	}
+
 	var configMgr coordinator.ConfigManager
 	var managed *managedConfigManager
 	var compModifiers = []coordinator.ComponentsModifier{InjectAPMConfig}

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

@@ -460,15 +460,30 @@ func (u *Upgrader) Upgrade(ctx context.Context, version string, rollback bool, s
 		return nil, goerrors.Join(err, rollbackErr)
 	}
 
-	//FIXME make it nicer
+	rollbackWindow := time.Duration(0)
+	if u.upgradeSettings != nil && u.upgradeSettings.Rollback != nil {
+		rollbackWindow = u.upgradeSettings.Rollback.Window
+	}
+
+	var currentInstallTTL *time.Time = nil
+	if rollbackWindow > 0 {
+		currentInstallTTLVar := time.Now().Add(rollbackWindow)
+		currentInstallTTL = &currentInstallTTLVar
+	}
+
 	_, err = u.installDescriptorSource.ModifyInstallDesc(
 		func(desc *v1.AgentInstallDesc) error {
 			if desc.VersionedHome == unpackRes.VersionedHome {
 				desc.Active = true
 				return nil
+			} else {
+				desc.Active = false
+			}
+
+			if desc.VersionedHome == currentVersionedHome {
+				desc.TTL = currentInstallTTL
 			}
 
-			desc.Active = false
 			return nil
 		},
 	)
@@ -501,10 +516,7 @@ func (u *Upgrader) Upgrade(ctx context.Context, version string, rollback bool, s
 		hash:          release.Commit(),
 		versionedHome: currentVersionedHome,
 	}
-	rollbackWindow := time.Duration(0)
-	if u.upgradeSettings != nil && u.upgradeSettings.Rollback != nil {
-		rollbackWindow = u.upgradeSettings.Rollback.Window
-	}
+
 	if err := u.markUpgrade(u.log,
 		paths.Data(), // data dir to place the marker in
 		time.Now(),

internal/pkg/agent/cmd/run.go

@@ -41,7 +41,6 @@ import (
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/reexec"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/secret"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade"
-	"github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade/details"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/configuration"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/errors"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/install"
@@ -141,7 +140,7 @@ func run(override application.CfgOverrider, testingMode bool, fleetInitTimeout t
 	defer cancel()
 	go service.ProcessWindowsControlEvents(stopBeat)
 
-	upgradeDetailsFromMarker, err := handleUpgrade()
+	initialUpdateMarker, err := handleUpgrade()
 	if err != nil {
 		return fmt.Errorf("error checking for and handling upgrade: %w", err)
 	}
@@ -154,7 +153,7 @@ func run(override application.CfgOverrider, testingMode bool, fleetInitTimeout t
 		_ = locker.Unlock()
 	}()
 
-	return runElasticAgent(ctx, cancel, override, stop, testingMode, fleetInitTimeout, upgradeDetailsFromMarker, modifiers...)
+	return runElasticAgent(ctx, cancel, override, stop, testingMode, fleetInitTimeout, initialUpdateMarker, modifiers...)
 }
 
 func logReturn(l *logger.Logger, err error) error {
@@ -171,7 +170,7 @@ func runElasticAgent(
 	stop chan bool,
 	testingMode bool,
 	fleetInitTimeout time.Duration,
-	upgradeDetailsFromMarker *details.Details,
+	initialUpgradeMarker *upgrade.UpdateMarker,
 	modifiers ...component.PlatformModifier,
 ) error {
 	err := coordinator.RestoreConfig()
@@ -296,7 +295,7 @@ func runElasticAgent(
 
 	isBootstrap := configuration.IsFleetServerBootstrap(cfg.Fleet)
 	coord, configMgr, _, err := application.New(ctx, l, baseLogger, logLvl, agentInfo, rex, tracer, testingMode,
-		fleetInitTimeout, isBootstrap, override, upgradeDetailsFromMarker, modifiers...)
+		fleetInitTimeout, isBootstrap, override, initialUpgradeMarker, modifiers...)
 	if err != nil {
 		return logReturn(l, err)
 	}
@@ -680,7 +679,7 @@ func setupMetrics(
 // handleUpgrade checks if agent is being run as part of an
 // ongoing upgrade operation, i.e. being re-exec'd and performs
 // any upgrade-specific work, if needed.
-func handleUpgrade() (*details.Details, error) {
+func handleUpgrade() (*upgrade.UpdateMarker, error) {
 	upgradeMarker, err := upgrade.LoadMarker(paths.Data())
 	if err != nil {
 		return nil, fmt.Errorf("unable to load upgrade marker to check if Agent is being upgraded: %w", err)
@@ -699,7 +698,7 @@ func handleUpgrade() (*details.Details, error) {
 		return nil, err
 	}
 
-	return upgradeMarker.Details, nil
+	return upgradeMarker, nil
 }
 
 func ensureInstallMarkerPresent() error {

internal/pkg/agent/install/install.go

@@ -73,7 +73,7 @@ func Install(cfgFile, topPath string, unprivileged bool, log *logp.Logger, pt *p
 
 	targetVersionedHome := filepath.FromSlash(pathMapper.Map(manifest.Package.VersionedHome))
 
-	err = setupInstallPath(topPath, ownership, targetVersionedHome, manifest.Package.Version, flavor)
+	err = setupInstallPath(topPath, ownership, targetVersionedHome, manifestutils.GetFullVersion(manifest), flavor)
 	if err != nil {
 		return utils.FileOwner{}, fmt.Errorf("error setting up install path: %w", err)
 	}