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

fix(queues): shutdown flag needs to be checked while waiting #11456

Merged
merged 1 commit into from
Aug 25, 2023

Conversation

hanshuebner
Copy link
Contributor

Summary

The previous fix (#11376) to enable batching during shutdown failed to check the shutdown flag while waiting for more items to batch. If the coalescing delay was large enough, this could cause the last batch to be lost.

This bug caused the test spec/02-integration/16-queues/01-shutdown_spec.lua to sporadically fail. The fix removes the flakiness.

Checklist

Issue reference

KAG-2449

The previous fix (#11376) to enable batching during shutdown failed to check
the shutdown flag while waiting for more items to batch.  If the coalescing
delay was large enough, this could cause the last batch to be lost.
@hanshuebner hanshuebner merged commit 3bf77d7 into master Aug 25, 2023
25 checks passed
@hanshuebner hanshuebner deleted the fix/kag-2449-queue-shutdown branch August 25, 2023 06:21
@team-gateway-bot
Copy link
Collaborator

The backport to release/3.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.2.x release/3.2.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.2.x
# Create a new branch
git switch --create backport-11456-to-release/3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3bf77d7455d019455c017e8e43d05e444bf78c86
# Push it to GitHub
git push --set-upstream origin backport-11456-to-release/3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.2.x

Then, create a pull request where the base branch is release/3.2.x and the compare/head branch is backport-11456-to-release/3.2.x.

@kikito
Copy link
Member

kikito commented Sep 19, 2023

Hit this while attempting to merge #11210 , backporting to 3.3 / 3.4

hanshuebner added a commit that referenced this pull request Sep 20, 2023
The previous fix (#11376) to enable batching during shutdown failed to check
the shutdown flag while waiting for more items to batch.  If the coalescing
delay was large enough, this could cause the last batch to be lost.

(cherry picked from commit 3bf77d7)
hanshuebner added a commit that referenced this pull request Sep 20, 2023
The previous fix (#11376) to enable batching during shutdown failed to check
the shutdown flag while waiting for more items to batch.  If the coalescing
delay was large enough, this could cause the last batch to be lost.

(cherry picked from commit 3bf77d7)
hanshuebner added a commit that referenced this pull request Sep 20, 2023
…#11607)

The previous fix (#11376) to enable batching during shutdown failed to check
the shutdown flag while waiting for more items to batch.  If the coalescing
delay was large enough, this could cause the last batch to be lost.

(cherry picked from commit 3bf77d7)

Co-authored-by: Hans Hübner <hans.huebner@gmail.com>
hanshuebner added a commit that referenced this pull request Sep 20, 2023
…#11608)

The previous fix (#11376) to enable batching during shutdown failed to check
the shutdown flag while waiting for more items to batch.  If the coalescing
delay was large enough, this could cause the last batch to be lost.

(cherry picked from commit 3bf77d7)

Co-authored-by: Hans Hübner <hans.huebner@gmail.com>
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.

4 participants