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

[Auditbeat] Cherry-pick #10897 to 7.0: System module: Fix and unify bucket closing logic #11027

Merged
merged 1 commit into from
Mar 5, 2019

Conversation

cwurm
Copy link
Contributor

@cwurm cwurm commented Mar 1, 2019

Cherry-pick of PR #10897 to 7.0 branch. Original message:

The host dataset is erroneously trying to save state in its Close() method. It should have saved the state earlier - usually at the end of Fetch() - and then should only close the bucket (something it is not doing at all). At the same time, it is not saving state in its reportState() method. Combined, this can lead to an error when the dataset is terminated before the first regular reportChanges() is run.

This fixes both issues and furthermore unifies the bucket closing logic across all six datasets of the System module.

…c#10897)

The `host` dataset is erroneously trying to save state in its `Close()` method. It should have saved the state earlier - usually at the end of `Fetch()` - and then should only close the bucket (something it is not doing at all). At the same time, it is not saving state in its `reportState()` method. Combined, this can lead to an error when the dataset is terminated before the first regular `reportChanges()` is run.

This fixes both issues and furthermore unifies the bucket closing logic across all six datasets of the System module.

(cherry picked from commit e007c9c)
@cwurm cwurm requested a review from a team as a code owner March 1, 2019 17:45
@cwurm cwurm changed the title Cherry-pick #10897 to 7.0: [Auditbeat] System module: Fix and unify bucket closing logic [Auditbeat] Cherry-pick #10897 to 7.0: System module: Fix and unify bucket closing logic Mar 1, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/secops

@cwurm cwurm merged commit 5798fc0 into elastic:7.0 Mar 5, 2019
@cwurm cwurm deleted the backport_10897_7.0 branch March 5, 2019 14:52
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