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 #21647 to 7.9: Make o365audit input cancellable #21702

Merged
merged 1 commit into from
Oct 13, 2020

Conversation

adriansr
Copy link
Contributor

@adriansr adriansr commented Oct 9, 2020

Cherry-pick of PR #21647 to 7.9 branch. Original message:

What does this PR do?

  • Updates the o365input to perform a cancellable wait when an error causes it to restart.
  • Also uses the configured error_retry_interval for the delay between restarts instead of a hardcoded 5m.

Why is it important?

Using time.Sleep prevents Filebeat to terminate until the timeout is elapsed.

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.

Related issues

Relates #21258

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)
@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 Oct 9, 2020
@botelastic
Copy link

botelastic bot commented Oct 9, 2020

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21702 opened]

  • Start Time: 2020-10-09T07:40:53.540+0000

  • Duration: 59 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 1896
Skipped 257
Total 2153

@adriansr adriansr added the review label Oct 9, 2020
@adriansr adriansr requested a review from a team October 9, 2020 08:41
@adriansr adriansr merged commit eef2ed9 into elastic:7.9 Oct 13, 2020
@zube zube bot removed the [zube]: Done label Jan 12, 2021
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
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 f2ab428)
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