Skip to content

[Dataflow Streaming] Enforce that get data requests for the same work item are not batched. - #36474

Merged
scwhittle merged 2 commits into
apache:masterfrom
scwhittle:fix_commit_stuckness
Oct 13, 2025
Merged

[Dataflow Streaming] Enforce that get data requests for the same work item are not batched.#36474
scwhittle merged 2 commits into
apache:masterfrom
scwhittle:fix_commit_stuckness

Conversation

@scwhittle

Copy link
Copy Markdown
Contributor

Such batches are rejected by the backend so we should prevent them to avoid stuckness. Parallel requests for the same work item are unexpected but could be caused by bugs in the harness or by incorrect parallel state fetching from a single bundle.


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@scwhittle

Copy link
Copy Markdown
Contributor Author

R: @arunpandianp

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @scwhittle, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical issue in the Dataflow Streaming worker where multiple 'get data' requests pertaining to the same work item could be erroneously batched together. Such batches are rejected by the backend, leading to job stuckness. The changes introduce robust validation within the batching mechanism to prevent these duplicate work items from being grouped, thereby enhancing the stability and reliability of the Dataflow worker's interaction with the Windmill service.

Highlights

  • Prevented Duplicate Work Item Batching: Implemented logic to ensure that 'get data' requests for the same work item are not batched together, resolving a known issue where the backend would reject such batches and cause job stuckness.
  • Refactored Request Handling: Reworked the internal representation of QueuedRequest and QueuedBatch to explicitly manage different types of data requests and track work tokens for robust batch validation.
  • Improved Batching Logic: Introduced a tryAddRequest method in QueuedBatch that enforces limits on batch size and count, and critically, prevents the inclusion of duplicate work items within a single batch.
  • Added Concurrency Test: Included a new test case to specifically verify that multiple concurrent requests for the same work item are correctly handled as separate requests, rather than being erroneously batched.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions

Copy link
Copy Markdown
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

… item are not batched. Such batches are rejected by the backend so we should prevent them to avoid stuckness. Parallel requests for the same work item are unexpected but could be caused by bugs in the harness or by incorrect parallel state fetching from a single bundle.
@scwhittle
scwhittle force-pushed the fix_commit_stuckness branch from ab673e7 to 09f8172 Compare October 10, 2025 13:29

@arunpandianp arunpandianp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

2 minor comments. LGTM otherwise. Can be merged after addressing them.

@scwhittle
scwhittle merged commit 6be76ae into apache:master Oct 13, 2025
15 checks passed
@scwhittle
scwhittle deleted the fix_commit_stuckness branch October 13, 2025 10:11
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.

2 participants