Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2023

This is an automatic backport of pull request #3384 done by Mergify.
Cherry-pick of 7e86d24 has failed:

On branch mergify/bp/8.10/pr-3384
Your branch is up to date with 'origin/8.10'.

You are currently cherry-picking commit 7e86d24cd3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1694187216-Uninstall-finds-and-kills-any-running-watcher-process.yaml
	modified:   internal/pkg/agent/cmd/uninstall.go
	modified:   internal/pkg/agent/install/uninstall.go
	new file:   pkg/utils/watcher.go
	modified:   testing/integration/upgrade_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   internal/pkg/agent/cmd/install.go
	both modified:   internal/pkg/agent/install/install.go
	deleted by us:   internal/pkg/agent/install/progress.go
	deleted by us:   internal/pkg/agent/install/progress_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…3384)

* kill watcher on uninstall

* Empty commit.

* Fix killWatcher.

* Empty commit.

* Another fix for killWatcher.

* Empty commit.

* Catch ErrProcessDone.

* Empty commit.

* Empty commit

* Add changelog fragment.

* Make it work on Windows.

* Change killWatcher to be in a loop.

* Add loop to killWatcher.

* Revert "Skip TestStandaloneUpgradeFailsStatus to fix failing integration tests again (#3391)"

This reverts commit bf467e3.

* Revert "Fix integration tests by waiting for the watcher to finish during upgrade tests (#3370)"

This reverts commit 94764be.

* Fix test.

* Revert "Revert "Skip TestStandaloneUpgradeFailsStatus to fix failing integration tests again (#3391)""

This reverts commit 3b0f040.

* Add progress tracking for uninstall like install.

* Log when no watchers our found.

* Improve uninstall.

* Fix data race.

(cherry picked from commit 7e86d24)

# Conflicts:
#	internal/pkg/agent/cmd/install.go
#	internal/pkg/agent/install/install.go
#	internal/pkg/agent/install/progress.go
#	internal/pkg/agent/install/progress_test.go
@mergify mergify bot requested a review from a team as a code owner October 2, 2023 19:58
@mergify mergify bot removed the request for review from a team October 2, 2023 19:58
@mergify mergify bot added the backport label Oct 2, 2023
@mergify mergify bot requested a review from michalpristas October 2, 2023 19:58
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 2, 2023
@mergify mergify bot requested a review from blakerouse October 2, 2023 19:58
@elasticmachine
Copy link
Contributor

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-10-02T19:58:19.911+0000

  • Duration: 5 min 14 sec

Steps errors 1

Expand to view the steps failures

check
  • Took 0 min 11 sec . View more details here
  • Description: make check-ci

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@blakerouse
Copy link
Contributor

This cannot be backported.

@blakerouse blakerouse closed this Oct 3, 2023
@mergify mergify bot deleted the mergify/bp/8.10/pr-3384 branch October 3, 2023 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants