[8.10](backport #3384) Uninstall finds and kills any running elastic-agent watch process

changelog/fragments/1694187216-Uninstall-finds-and-kills-any-running-watcher-process.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: bug-fix
+
+# Change summary; a 80ish characters long description of the change.
+summary: Uninstall finds and kills any running watcher process
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component:
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/elastic-agent/pull/3384
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+issue: https://github.com/elastic/elastic-agent/issues/3371

internal/pkg/agent/cmd/install.go

@@ -179,20 +179,43 @@
 		}
 	}
 
+<<<<<<< HEAD
 	cfgFile := paths.ConfigFile()
 	if status != install.PackageInstall {
 		err = install.Install(cfgFile, topPath)
+=======
+	pt := install.NewProgressTracker(streams.Out)
+	s := pt.Start()
+	defer func() {
+		if err != nil {
+			s.Failed()
+		} else {
+			s.Succeeded()
+		}
+	}()
+
+	cfgFile := paths.ConfigFile()
+	if status != install.PackageInstall {
+		err = install.Install(cfgFile, topPath, s)
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 		if err != nil {
 			return err
 		}
 
 		defer func() {
 			if err != nil {
-				_ = install.Uninstall(cfgFile, topPath, "")
+				uninstallStep := s.StepStart("Uninstalling")
+				innerErr := install.Uninstall(cfgFile, topPath, "", uninstallStep)
+				if innerErr != nil {
+					uninstallStep.Failed()
+				} else {
+					uninstallStep.Succeeded()
+				}
 			}
 		}()
 
 		if !delayEnroll {
+<<<<<<< HEAD
 			err = install.StartService(topPath)
 			if err != nil {
 				fmt.Fprintf(streams.Out, "Installation failed to start Elastic Agent service.\n")
@@ -202,6 +225,26 @@
 			defer func() {
 				if err != nil {
 					_ = install.StopService(topPath)
+=======
+			startServiceStep := s.StepStart("Starting service")
+			err = install.StartService(topPath)
+			if err != nil {
+				startServiceStep.Failed()
+				fmt.Fprintf(streams.Out, "Installation failed to start Elastic Agent service.\n")
+				return err
+			}
+			startServiceStep.Succeeded()
+
+			defer func() {
+				if err != nil {
+					stoppingServiceStep := s.StepStart("Stopping service")
+					innerErr := install.StopService(topPath)
+					if innerErr != nil {
+						stoppingServiceStep.Failed()
+					} else {
+						stoppingServiceStep.Succeeded()
+					}
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 				}
 			}()
 		}
@@ -214,12 +257,21 @@
 		enrollCmd.Stdin = os.Stdin
 		enrollCmd.Stdout = os.Stdout
 		enrollCmd.Stderr = os.Stderr
+<<<<<<< HEAD
 		err = enrollCmd.Start()
 		if err != nil {
+=======
+
+		enrollStep := s.StepStart("Enrolling Elastic Agent with Fleet")
+		err = enrollCmd.Start()
+		if err != nil {
+			enrollStep.Failed()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 			return fmt.Errorf("failed to execute enroll command: %w", err)
 		}
 		err = enrollCmd.Wait()
 		if err != nil {
+<<<<<<< HEAD
 			if status != install.PackageInstall {
 				var exitErr *exec.ExitError
 				_ = install.Uninstall(cfgFile, topPath, "")
@@ -229,6 +281,14 @@
 			}
 			return fmt.Errorf("enroll command failed for unknown reason: %w", err)
 		}
+=======
+			enrollStep.Failed()
+			// uninstall doesn't need to be performed here the defer above will
+			// catch the error and perform the uninstall
+			return fmt.Errorf("enroll command failed for unknown reason: %w", err)
+		}
+		enrollStep.Succeeded()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 	}
 
 	if err := info.CreateInstallMarker(topPath); err != nil {

internal/pkg/agent/cmd/uninstall.go

@@ -80,9 +80,15 @@ func uninstallCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
 		}
 	}
 
-	err = install.Uninstall(paths.ConfigFile(), paths.Top(), uninstallToken)
+	pt := install.NewProgressTracker(streams.Out)
+	s := pt.Start()
+
+	err = install.Uninstall(paths.ConfigFile(), paths.Top(), uninstallToken, s)
 	if err != nil {
+		s.Failed()
 		return err
+	} else {
+		s.Succeeded()
 	}
 	fmt.Fprintf(streams.Out, "Elastic Agent has been uninstalled.\n")
 

internal/pkg/agent/install/install.go

@@ -1,4 +1,4 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
@@ -22,7 +22,11 @@
 )
 
 // Install installs Elastic Agent persistently on the system including creating and starting its service.
+<<<<<<< HEAD
 func Install(cfgFile, topPath string) error {
+=======
+func Install(cfgFile, topPath string, pt ProgressTrackerStep) error {
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 	dir, err := findDirectory()
 	if err != nil {
 		return errors.New(err, "failed to discover the source directory for installation", errors.TypeFilesystem)
@@ -33,13 +37,24 @@
 	// There is no uninstall token for "install" command.
 	// Uninstall will fail on protected agent.
 	// The protected Agent will need to be uninstalled first before it can be installed.
+<<<<<<< HEAD
 	err = Uninstall(cfgFile, topPath, "")
 	if err != nil {
+=======
+	s := pt.StepStart("Uninstalling current Elastic Agent")
+	err = Uninstall(cfgFile, topPath, "", s)
+	if err != nil {
+		s.Failed()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 		return errors.New(
 			err,
 			fmt.Sprintf("failed to uninstall Agent at (%s)", filepath.Dir(topPath)),
 			errors.M("directory", filepath.Dir(topPath)))
 	}
+<<<<<<< HEAD
+=======
+	s.Succeeded()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 
 	// ensure parent directory exists, copy source into install path
 	err = os.MkdirAll(filepath.Dir(topPath), 0755)
@@ -49,18 +64,32 @@
 			fmt.Sprintf("failed to create installation parent directory (%s)", filepath.Dir(topPath)),
 			errors.M("directory", filepath.Dir(topPath)))
 	}
+<<<<<<< HEAD
+=======
+
+	// copy source into install path
+	s = pt.StepStart("Copying files")
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 	err = copy.Copy(dir, topPath, copy.Options{
 		OnSymlink: func(_ string) copy.SymlinkAction {
 			return copy.Shallow
 		},
 		Sync: true,
 	})
 	if err != nil {
+<<<<<<< HEAD
+=======
+		s.Failed()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 		return errors.New(
 			err,
 			fmt.Sprintf("failed to copy source directory (%s) to destination (%s)", dir, topPath),
 			errors.M("source", dir), errors.M("destination", topPath))
 	}
+<<<<<<< HEAD
+=======
+	s.Succeeded()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 
 	// place shell wrapper, if present on platform
 	if paths.ShellWrapperPath != "" {
@@ -124,17 +153,33 @@
 	}
 
 	// install service
+<<<<<<< HEAD
 	svc, err := newService(topPath)
 	if err != nil {
+=======
+	s = pt.StepStart("Installing service")
+	svc, err := newService(topPath)
+	if err != nil {
+		s.Failed()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 		return err
 	}
 	err = svc.Install()
 	if err != nil {
+<<<<<<< HEAD
+=======
+		s.Failed()
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 		return errors.New(
 			err,
 			fmt.Sprintf("failed to install service (%s)", paths.ServiceName),
 			errors.M("service", paths.ServiceName))
 	}
+<<<<<<< HEAD
+=======
+	s.Succeeded()
+
+>>>>>>> 7e86d24cd3 (Uninstall finds and kills any running `elastic-agent watch` process (#3384))
 	return nil
 }