Skip to content

Commit 2eecafb

Browse files
authored
Increase waiting time and timeout for removal of agent files (#4310)
* increase waiting time and timeout for removal of agent files
1 parent 6899b75 commit 2eecafb

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: bug-fix
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Increase timeout for file removal during uninstall
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; a word indicating the component this changeset affects.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

internal/pkg/agent/install/uninstall.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func Uninstall(cfgFile, topPath, uninstallToken string, log *logp.Logger, pt *pr
139139
// to an ERROR_SHARING_VIOLATION. RemovePath will retry up to 2
140140
// seconds if it keeps getting that error.
141141
func RemovePath(path string) error {
142-
const arbitraryTimeout = 5 * time.Second
142+
const arbitraryTimeout = 30 * time.Second
143143
start := time.Now()
144144
var lastErr error
145145
for time.Since(start) <= arbitraryTimeout {
@@ -154,7 +154,7 @@ func RemovePath(path string) error {
154154
_ = removeBlockingExe(lastErr)
155155
}
156156

157-
time.Sleep(50 * time.Millisecond)
157+
time.Sleep(500 * time.Millisecond)
158158
}
159159

160160
return fmt.Errorf("timed out while removing %q. Last error: %w", path, lastErr)

0 commit comments

Comments
 (0)