Skip to content

[release-2.75] Cherry-pick #39096 to the branch - #39115

Merged
Amar3tto merged 3 commits into
apache:release-2.75from
shunping:cp-39096
Jun 26, 2026
Merged

[release-2.75] Cherry-pick #39096 to the branch#39115
Amar3tto merged 3 commits into
apache:release-2.75from
shunping:cp-39096

Conversation

@shunping

@shunping shunping commented Jun 25, 2026

Copy link
Copy Markdown
Collaborator

Apply #39096 to release 2.75 to fix test failure on Java_IOs_Direct PreCommit

shunping added 2 commits June 25, 2026 14:50
Previously, in ExecutorServiceParallelExecutor, if an exception
occurred during registry cleanup (such as a timeout inside
DoFn teardown), the pipeline state was transitioned to terminal
before the exception was queued in `visibleUpdates`.

This introduced a race condition where `waitUntilFinish()` could
detect the terminal state and exit successfully before the
exception was offered to the updates queue, swallowing the exception.

This caused tests like `CallTest.givenTeardownTimeout_throwsError`
to fail since they expected the pipeline to throw an exception.
This change swaps the order so that the exception is posted to
`visibleUpdates` before updating the pipeline state to terminal,
ensuring the exception is always propagated.
@gemini-code-assist

Copy link
Copy Markdown
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 backports a fix to the release-2.75 branch that improves the robustness of the pipeline shutdown process. By wrapping the error handling logic in a try-finally block, it ensures that the pipeline state is reliably transitioned to a terminal state regardless of whether exceptions are encountered during execution.

Highlights

  • Refactored shutdown logic: Updated the shutdown sequence in ExecutorServiceParallelExecutor to ensure the pipeline state is correctly updated even when errors occur during execution.
  • Improved error reporting: Enhanced exception handling to include class names when error messages are null, providing better visibility into pipeline failures.
New Features

🧠 You can now enable Memory (public preview) 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.

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 the 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 counterproductive. 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.

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.

@shunping

Copy link
Copy Markdown
Collaborator Author

Run Java_IOs_Direct PreCommit

@gemini-code-assist gemini-code-assist Bot 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.

Code Review

This pull request updates the shutdownIfNecessary method in ExecutorServiceParallelExecutor.java to ensure that the pipeline state transition to a terminal node is executed within a finally block, even if errors are encountered. It also improves error message formatting by falling back to the exception class name if the message is null. A review comment correctly identifies that newline characters in the exception message are double-escaped, which would cause literal backslash-n characters to be printed in the logs.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@shunping

Copy link
Copy Markdown
Collaborator Author

Java_IOs_Direct PreCommit: https://github.com/apache/beam/actions/runs/28193260557

@shunping

Copy link
Copy Markdown
Collaborator Author

r: @Amar3tto

@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

@shunping

Copy link
Copy Markdown
Collaborator Author

Run Java_IOs_Direct PreCommit

@shunping

Copy link
Copy Markdown
Collaborator Author

Java_IOs_Direct PreCommit: https://github.com/apache/beam/actions/runs/28195131915

@Amar3tto
Amar3tto merged commit ccbfb33 into apache:release-2.75 Jun 26, 2026
14 checks passed
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