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.

Sign up for GitHub

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

Jump to bottom

[Backport release/3.3.x] fix(queues): shutdown flag needs to be checked while waiting #11607

Merged
merged 1 commit into from
Sep 20, 2023
Merged

[Backport release/3.3.x] fix(queues): shutdown flag needs to be checked while waiting #11607

merged 1 commit into from
Sep 20, 2023

Conversation

team-gateway-bot
Copy link
Collaborator

@team-gateway-bot team-gateway-bot commented Sep 19, 2023 •
edited by kikito
Loading

Backport 3bf77d7 from #11456.

This fixes a flakyness issue in the tests

@kikito
Copy link
Member

kikito commented Sep 19, 2023

@hanshuebner I have tried to backport this to 3.3, but the flaky test that I am trying to make unflaky is still flaky. Could you help me out?

Do I need to include #11376 in the backport?

@kikito kikito requested a review from hanshuebner September 19, 2023 13:35
kikito
kikito previously requested changes Sep 19, 2023
View reviewed changes
Copy link
Member

@kikito kikito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing approval as the PR does not seem to fix the flaky test

@hanshuebner
Copy link
Contributor

@kikito #11606 is needed first. I was not aware that we're maintaining CE release branches like we do with EE branches.

@github-actions github-actions bot added the author/community PRs from the open-source community (not Kong Inc) label Sep 19, 2023
@hanshuebner
fix(queues): shutdown flag needs to be checked while waiting (#11456)
8484127 
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 hanshuebner force-pushed the backport-11456-to-release/3.3.x branch from a1753d0 to 8484127 Compare September 20, 2023 08:25
@hanshuebner hanshuebner dismissed kikito’s stale review September 20, 2023 08:25

Fix for other failing test now merged, this PR rebased

@hanshuebner hanshuebner merged commit a4d7a82 into release/3.3.x Sep 20, 2023
@hanshuebner hanshuebner deleted the backport-11456-to-release/3.3.x branch September 20, 2023 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanshuebner hanshuebner hanshuebner approved these changes

@kikito kikito kikito left review comments

Assignees

@hanshuebner hanshuebner

Labels
author/community PRs from the open-source community (not Kong Inc) size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@team-gateway-bot @kikito @hanshuebner