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

Cherry-pick #24343 to 7.12: Fix windows installer during enroll #24389

Merged
merged 1 commit into from
Mar 5, 2021

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Mar 5, 2021

Cherry-pick of PR #24343 to 7.21 branch. Original message:

What does this PR do?

after #24253 issue still occurred on some systems.
the problem really is with rename and sync after unzip which is skipped in case ctx is cancelled.
my first option was to make agent rename rootDir even if zip is not fully unpacked and sync directories all rootDir, installDir and temp directories.
this complicated code to the form I did not like, so many conditions there. but it was working 5/5

i went with a code-cleaner way (especially with change in mind @blakerouse suggested that we should remove it before start) and i let unzip finish, rename rootDir to correct tmp install path, sync paths and then let awaitable installer wait for whole installation to finish. we lose tiny amount of time, but cleaner code is worth small perf impact especially in this edge case scenario.

Why is it important?

Fixes #24317

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

[Ingest-Manager] Fix windows installer during enroll (elastic#24343)
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 5, 2021
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport looks good.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

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

Expand to view the summary

Build stats

  • Build Cause: Pull request #24389 opened

  • Start Time: 2021-03-05T15:01:44.876+0000

  • Duration: 114 min 33 sec

  • Commit: 5001eaf

Test stats 🧪

Test Results
Failed 0
Passed 6500
Skipped 24
Total 6524

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6500
Skipped 24
Total 6524

@michalpristas michalpristas merged commit 3981b95 into elastic:7.12 Mar 5, 2021
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants