-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* [uninstall] ensure service is stopped on windows the kardianos service manager doesn't distinguish between 'Stopped' and 'StopPending' on Windows, so we need to query to make sure the service is really stopped. Otherwise we can try to remove the files while the service is still running. * Fixing linter issue + missing arg * Update wait_service_windows.go * incorporate feedback and add integration test * add changelog fragment --------- Co-authored-by: Pierre HILBERT <[email protected]> (cherry picked from commit 82efe13) Co-authored-by: Lee E Hinman <[email protected]>
- Loading branch information
1 parent
bba5f2c
commit f2bb27d
Showing
5 changed files
with
186 additions
and
2 deletions.
There are no files selected for viewing
32 changes: 32 additions & 0 deletions
32
changelog/fragments/1707857612-windows_stop_before_uninstall.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: On Windows make sure the service is stopped before uninstalling. | ||
|
||
# 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; a word indicating the component this changeset affects. | ||
component: elastic-agent | ||
|
||
# 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/owner/repo/1234 | ||
|
||
# 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/owner/repo/1234 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// 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. | ||
|
||
//go:build !windows | ||
|
||
package install | ||
|
||
import ( | ||
"time" | ||
) | ||
|
||
// isStopped waits until the service has stopped. On non Windows | ||
// systems this isn't necessary so just return. | ||
func isStopped(timeout time.Duration, interval time.Duration, service string) error { | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// 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. | ||
|
||
//go:build windows | ||
|
||
package install | ||
|
||
import ( | ||
"fmt" | ||
"time" | ||
|
||
"golang.org/x/sys/windows/svc" | ||
"golang.org/x/sys/windows/svc/mgr" | ||
) | ||
|
||
// isStopped queries the Windows service manager to see if the state | ||
// of the service is stopped. It will repeat the query every | ||
// 'interval' until the 'timeout' is reached. It returns nil if the | ||
// system is stopped within the timeout period. An error is returned | ||
// if the service doesn't stop before the timeout or if there are | ||
// errors communicating with the service manager. | ||
func isStopped(timeout time.Duration, interval time.Duration, service string) error { | ||
var err error | ||
var status svc.Status | ||
|
||
m, err := mgr.Connect() | ||
if err != nil { | ||
return fmt.Errorf("failed to connect to service manager: %w", err) | ||
} | ||
defer func() { | ||
_ = m.Disconnect() | ||
}() | ||
|
||
s, err := m.OpenService(service) | ||
if err != nil { | ||
return fmt.Errorf("failed to open service (%s): %w", service, err) | ||
} | ||
defer s.Close() | ||
|
||
ticker := time.NewTicker(interval) | ||
defer ticker.Stop() | ||
timer := time.NewTimer(timeout) | ||
defer timer.Stop() | ||
|
||
for { | ||
select { | ||
case <-ticker.C: | ||
status, err = s.Query() | ||
if err != nil { | ||
return fmt.Errorf("error querying service (%s): %w", service, err) | ||
} | ||
if status.State == svc.Stopped { | ||
return nil | ||
} | ||
case <-timer.C: | ||
return fmt.Errorf("timed out after %s waiting for service (%s) to stop, last state was: %d", timeout, service, status.State) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters