Skip to content

SDF draining in dataflow runner v1#37831

Open
stankiewicz wants to merge 2 commits intoapache:masterfrom
stankiewicz:sdf_draining_in_runner_v1
Open

SDF draining in dataflow runner v1#37831
stankiewicz wants to merge 2 commits intoapache:masterfrom
stankiewicz:sdf_draining_in_runner_v1

Conversation

@stankiewicz
Copy link
Contributor

@stankiewicz stankiewicz commented Mar 11, 2026

Enable draining of SDFs for runner v1

Change: In stateful do fn, if timer received contains CausedByDrain bit, we remove hold and don't set next timer.

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.

@stankiewicz
Copy link
Contributor Author

/gemini review

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello, 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 enhances Apache Beam's runner v1 to support the draining of Splittable DoFns (SDFs). It integrates a CausedByDrain signal into the DoFn execution lifecycle, allowing DoFns to be aware of and respond to pipeline draining events. This ensures a more robust and controlled shutdown or update process for pipelines utilizing SDFs, by propagating the draining state and adjusting timer behavior accordingly.

Highlights

  • SDF Draining Support: Introduced the CausedByDrain parameter across various DoFn execution contexts, enabling Splittable DoFns (SDFs) to gracefully handle draining signals during pipeline shutdown or updates.
  • DoFn Invoker and Signature Updates: Extended the DoFnInvoker and DoFnSignature reflection mechanisms to recognize and provide the CausedByDrain parameter to ProcessElement and OnTimer methods, allowing user DoFns to declare and receive this signal.
  • Timer Handling during Draining: Modified the SDF execution logic to prevent new timers from being set when a draining signal is active, ensuring that processing gracefully concludes without scheduling new work.
  • Testing for Draining Behavior: Added a new test case to SplittableParDoProcessFnTest to validate the correct propagation and handling of the CausedByDrain signal within a DoFn's process method.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • runners/core-java/src/main/java/org/apache/beam/runners/core/OutputAndTimeBoundedSplittableProcessElementInvoker.java
    • Added causedByDrain method to the ProcessContext implementation.
  • runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java
    • Implemented causedByDrain in ProcessContext and TimerInternals.TimerData handling.
    • Prevented new timers from being set when a draining signal is active.
  • runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDoViaKeyedWorkItems.java
    • Modified WindowedValue reading to include drain information from timers.
    • Conditionally set timers only when not in a draining state.
  • runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoProcessFnTest.java
    • Added imports for TimeDomain and CausedByDrain.
    • Introduced advanceDrain method to simulate draining.
    • Updated WatermarkUpdateFn to accept CausedByDrain as a parameter.
    • Added a new test case testDrains to verify draining behavior.
  • sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnTester.java
    • Updated ProcessContext and ArgumentProvider to support causedByDrain.
  • sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java
    • Integrated CausedByDrainParameter into the DoFnInvoker factory for dynamic parameter injection.
  • sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnInvoker.java
    • Added causedByDrain method to the ArgumentProvider interface and its base implementation.
  • sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignature.java
    • Extended DoFnSignature to include CausedByDrainParameter for reflection.
  • sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/DoFnSignatures.java
    • Registered CausedByDrainParameter as an allowed parameter type for ProcessElement and OnTimer methods.
  • sdks/java/core/src/main/java/org/apache/beam/sdk/util/construction/SplittableParDoNaiveBounded.java
    • Implemented causedByDrain method in its ProcessContext implementation.
  • sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/reflect/DoFnSignaturesTest.java
    • Updated tests to verify CausedByDrainParameter in ProcessElement and OnTimer method signatures.
  • sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java
    • Implemented causedByDrain method in ProcessContext for the Fn API runner.
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.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request enables draining of Splittable DoFns for runner v1. The changes involve plumbing the CausedByDrain information through various contexts and invokers, and modifying the logic for setting continuation timers to respect the drain signal. The changes look mostly correct, but I've found a potential NullPointerException in SplittableParDoViaKeyedWorkItems.java on the initial processing call. I've also pointed out a leftover comment and an opportunity to reduce code duplication.

@stankiewicz
Copy link
Contributor Author

/gemini review

@stankiewicz stankiewicz changed the title SDF draining in runner v1 SDF draining in dataflow runner v1 Mar 11, 2026
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request enables draining of Splittable DoFns for runner v1. The changes are comprehensive, plumbing the CausedByDrain information through the SDK and runner core components like DoFnInvoker and DoFnSignature. The core logic in SplittableParDoViaKeyedWorkItems correctly prevents scheduling new work during a drain. The addition of tests, including testDrains, effectively validates the new functionality. The implementation is solid. I have one suggestion to simplify a conditional expression for better readability.

@stankiewicz stankiewicz force-pushed the sdf_draining_in_runner_v1 branch from c1f2855 to 2f69f04 Compare March 11, 2026 22:58
@github-actions
Copy link
Contributor

Assigning reviewers:

R: @Abacn for label java.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@stankiewicz
Copy link
Contributor Author

R: @kennknowles

@github-actions
Copy link
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

@stankiewicz stankiewicz force-pushed the sdf_draining_in_runner_v1 branch from 2f69f04 to 8241e66 Compare March 12, 2026 14:58
@stankiewicz
Copy link
Contributor Author

/gemini review

@stankiewicz
Copy link
Contributor Author

R: @acrites

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request enables draining for Splittable DoFns in the Dataflow runner v1. The changes correctly handle drain signals in SplittableParDoViaKeyedWorkItems by not setting new timers for continuations and clearing the watermark hold state, which is the correct behavior for draining. The changes also propagate the drain status to the SDF's process context. The new tests are well-written and validate the draining behavior.

I found one issue in FnApiDoFnRunner.java related to a refactoring of causedByDrain handling. The change introduces an inconsistency in how causedByDrain is exposed for non-splittable DoFns, which I've commented on.

@stankiewicz stankiewicz force-pushed the sdf_draining_in_runner_v1 branch from af38fc6 to 89e0ba0 Compare March 12, 2026 15:15
@stankiewicz
Copy link
Contributor Author

@stankiewicz
Copy link
Contributor Author

Run Flink Container PreCommit

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.

1 participant