Cherry-pick #21647 to 7.x: Make o365audit input cancellable#21700
Merged
adriansr merged 1 commit intoelastic:7.xfrom Oct 13, 2020
Merged
Cherry-pick #21647 to 7.x: Make o365audit input cancellable#21700adriansr merged 1 commit intoelastic:7.xfrom
adriansr merged 1 commit intoelastic:7.xfrom
Conversation
PR elastic#21258 introduced a restart mechanism for o365input so that it didn't stop working once a fatal error was found. This updates the restart delay to use a cancellation-context-aware method so that the input doesn't block Filebeat termination. (cherry picked from commit 1abe97b)
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
andrewkroh
approved these changes
Oct 13, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #21647 to 7.x branch. Original message:
What does this PR do?
o365inputto perform a cancellable wait when an error causes it to restart.error_retry_intervalfor the delay between restarts instead of a hardcoded5m.Why is it important?
Using
time.Sleepprevents Filebeat to terminate until the timeout is elapsed.Checklist
[ ] 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 inCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Related issues
Relates #21258