Skip to content

[8.17](backport #43369) x-pack/filebeat/input/awss3: allow a grace time on shutdown#43530

Merged
efd6 merged 2 commits into8.17from
mergify/bp/8.17/pr-43369
Mar 27, 2025
Merged

[8.17](backport #43369) x-pack/filebeat/input/awss3: allow a grace time on shutdown#43530
efd6 merged 2 commits into8.17from
mergify/bp/8.17/pr-43369

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Mar 27, 2025

Proposed commit message

x-pack/filebeat/input/awss3: allow a grace time on shutdown

We may have SQS message requests in flight that are being serviced when the
input's context is cancelled. This allows the user to specify a time to wait
after the context is cancelled before the processing and publication work is
terminated.

We finish as soon as the set of pending requests had been received and
published, cut short after the grace time.

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #43369 done by [Mergify](https://mergify.com).

We may have SQS message requests in flight that are being serviced when the
input's context is cancelled. This allows the user to specify a time to wait
after the context is cancelled before the processing and publication work is
terminated.

We finish as soon as the set of pending requests had been received and
published, cut short after the grace time.

(cherry picked from commit c0d439c)

# Conflicts:
#	docs/reference/filebeat/filebeat-input-aws-s3.md
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Mar 27, 2025
@mergify mergify Bot requested review from a team as code owners March 27, 2025 06:09
@mergify mergify Bot requested review from mauri870 and removed request for a team March 27, 2025 06:09
@mergify mergify Bot assigned efd6 Mar 27, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Mar 27, 2025

Cherry-pick of c0d439c has failed:

On branch mergify/bp/8.17/pr-43369
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit c0d439ce3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/input/awss3/config.go
	modified:   x-pack/filebeat/input/awss3/config_test.go
	modified:   x-pack/filebeat/input/awss3/sqs_input.go
	modified:   x-pack/filebeat/input/awss3/sqs_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/reference/filebeat/filebeat-input-aws-s3.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot requested a review from khushijain21 March 27, 2025 06:09
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 27, 2025
@botelastic
Copy link
Copy Markdown

botelastic Bot commented Mar 27, 2025

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

* apply doc changes to asciidoc and remove markdown addition
@efd6 efd6 merged commit d38ce2f into 8.17 Mar 27, 2025
23 checks passed
@efd6 efd6 deleted the mergify/bp/8.17/pr-43369 branch March 27, 2025 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant