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

Disable lockfile under fleet mode #33988

Merged

Conversation

fearful-symmetry
Copy link
Contributor

What does this PR do?

This is the other half of the fix for #31670 (comment)

This disables the lockfile when the beat is running under elastic-agent.

I've tested this, but I'm not 100% sure on what, if any, unintentional behaviors this might cause. Theoretically elastic-agent should be responsible for correctly starting/restarting a beat, and elastic-agent has its own lockfile.

Why is it important?

We're having a lot of issues with lockfiles under elastic-agent.

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 added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@fearful-symmetry fearful-symmetry added bug Team:Elastic-Agent Label for the Agent team labels Dec 7, 2022
@fearful-symmetry fearful-symmetry self-assigned this Dec 7, 2022
@fearful-symmetry fearful-symmetry requested a review from a team as a code owner December 7, 2022 18:50
@fearful-symmetry fearful-symmetry requested review from rdner and cmacknz and removed request for a team December 7, 2022 18:50
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@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 Dec 7, 2022
@mergify
Copy link
Contributor

mergify bot commented Dec 7, 2022

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @fearful-symmetry? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 7, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-12-12T20:15:23.659+0000

  • Duration: 69 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 25089
Skipped 1954
Total 27043

💚 Flaky test report

Tests succeeded.

🤖 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 and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@mergify
Copy link
Contributor

mergify bot commented Dec 8, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b lockfile-fleetmode-disable upstream/lockfile-fleetmode-disable
git merge upstream/main
git push upstream lockfile-fleetmode-disable

Copy link
Member

@cmacknz cmacknz left a comment

Choose a reason for hiding this comment

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

This change looks straightforward enough. Likely we have to let this marinate on main for a while to see if anything surprising happens.

@sonarcloud
Copy link

sonarcloud bot commented Dec 12, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@fearful-symmetry fearful-symmetry merged commit 493b3a4 into elastic:main Dec 13, 2022
@cmacknz cmacknz added the backport-v8.6.0 Automated backport with mergify label Dec 21, 2022
mergify bot pushed a commit that referenced this pull request Dec 21, 2022
* diable lockfile under fleet mode

* update docs

* add changelog

(cherry picked from commit 493b3a4)

# Conflicts:
#	libbeat/cmd/instance/beat.go
cmacknz added a commit that referenced this pull request Dec 21, 2022
* Disable lockfile under fleet mode (#33988)

* diable lockfile under fleet mode

* update docs

* add changelog

(cherry picked from commit 493b3a4)

# Conflicts:
#	libbeat/cmd/instance/beat.go

* Resolve conflict in beat.go

Co-authored-by: Alex K <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
* diable lockfile under fleet mode

* update docs

* add changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.6.0 Automated backport with mergify bug Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants