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 #24055 to 7.11: Fix reloading of log level for services #24062

Merged
merged 1 commit into from
Feb 16, 2021

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Feb 16, 2021

Cherry-pick of PR #24055 to 7.11 branch. Original message:

What does this PR do?

This PR fixes 2 things.

First one is an issue introduced in #23886, this caused that VarSkipKey removed key from Action which was then stored using Ack and Store. This action was input-less so after restart agent was not running anything and it thought it;s ok because preserved state id is same as the one from fleet.
This one I discovered without filing an issue

Second one is bug described in #23720. The issue here is that agent creates a server with own counter, set to 1. But service already has a config with state counter. So if we change log level and restart an agent counter is 1 which == to the counter in a service and agent thinks everything is up to date.
Fix is that we take counter from a service and if it's > 0, which means services already retrieved some configuration we force reload of config by incrementing our local counter to what_service_has + 1

Why is it important?

Fixes bugs

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.

…24055)

[Ingest Management] Fix reloading of log level for services (elastic#24055)
@michalpristas michalpristas self-assigned this Feb 16, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 16, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 16, 2021
@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 #24062 opened

  • Start Time: 2021-02-16T14:38:56.320+0000

  • Duration: 27 min 29 sec

  • Commit: 5da30dd

Test stats 🧪

Test Results
Failed 0
Passed 5654
Skipped 24
Total 5678

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 5654
Skipped 24
Total 5678

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants