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

[Ingest-Manager] Fix windows installer during enroll #24343

Merged
merged 3 commits into from
Mar 5, 2021

Conversation

michalpristas
Copy link
Contributor

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.

@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 4, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 4, 2021

💚 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 #24343 updated

  • Start Time: 2021-03-04T15:41:38.129+0000

  • Duration: 50 min 59 sec

  • Commit: d15d50e

Test stats 🧪

Test Results
Failed 0
Passed 6548
Skipped 16
Total 6564

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 6548
Skipped 16
Total 6564

@michalpristas
Copy link
Contributor Author

/package

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.

How does this force the re-extract everytime? I would have expected the extract operation to change the Check function.

@michalpristas
Copy link
Contributor Author

@blakerouse sorry for the confusion this is not forcing that just yet. this just lets unzip finish and waits for it before shutdown. the behavior is very weird.

i want to do forced reextraction but this will be not that trivial as we need to check if there's some application already running/strarting (other checks i did not think of) before removing it.

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.

True we do not need handle the case where it is already running. Maybe we should do an extraction per application (instead of per application type). Basically we run 2 filebeats, we can extract filebeat twice into 2 different directories.

Otherwise this change looks okay. PR description through me off, maybe that should be updated just for reference in the future.

@michalpristas michalpristas merged commit ee40f6f into elastic:master Mar 5, 2021
michalpristas added a commit to michalpristas/beats that referenced this pull request Mar 5, 2021
[Ingest-Manager] Fix windows installer during enroll (elastic#24343)
michalpristas added a commit to michalpristas/beats that referenced this pull request Mar 5, 2021
[Ingest-Manager] Fix windows installer during enroll (elastic#24343)
michalpristas added a commit that referenced this pull request Mar 5, 2021
[Ingest-Manager] Fix windows installer during enroll (#24343)
@amolnater-qasource
Copy link

amolnater-qasource commented Mar 8, 2021

Hi @EricDavisX

We have performed smoke test using windows x64 agent on 7.12.0 Snapshot Kibana cloud environment. Build Details are as follows:

    Artifact link used: https://snapshots.elastic.co/7.12.0-07994102/downloads/beats/elastic-agent/elastic-agent-7.12.0-SNAPSHOT-windows-x86_64.zip
    Build: 39220
    Commit: 10e035085b6ab636765b76500803c9db19492c8b

Testrun Link: Ingest Manager 7.12.0 Snapshot Smoke Test Plan

Thanks
QAS

michalpristas added a commit that referenced this pull request Mar 9, 2021
[Ingest-Manager] Fix windows installer during enroll (#24343)
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
Labels
bug Team:Elastic-Agent Label for the Agent team v7.12.0
Projects
None yet
4 participants