Skip to content

fix rrio teardown executor cleanup path#38417

Merged
Abacn merged 1 commit intoapache:masterfrom
aIbrahiim:fix/rrio-teardown-timeout-flake
May 8, 2026
Merged

fix rrio teardown executor cleanup path#38417
Abacn merged 1 commit intoapache:masterfrom
aIbrahiim:fix/rrio-teardown-timeout-flake

Conversation

@aIbrahiim
Copy link
Copy Markdown
Contributor

Please add a meaningful description for your change here


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.

@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 improves the reliability of the RRIO teardown process by ensuring that the executor service is consistently shut down, even if an error occurs during the teardown execution. This prevents potential resource leaks by guaranteeing the cleanup path is always followed.

Highlights

  • Executor Cleanup: Wrapped the teardown logic in a try-finally block to ensure the executor is properly shut down regardless of whether the teardown operation succeeds or fails.
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.

Copy link
Copy Markdown
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 modifies the teardown method in Call.java to ensure the executor is shut down by wrapping the core teardown logic in a try-finally block. Feedback suggests replacing checkStateNotNull(executor) with a null check within the finally block to avoid masking exceptions thrown from the try block if the executor was never initialized.

Comment on lines +296 to +301
checkStateNotNull(executor).shutdown();
try {
boolean ignored = executor.awaitTermination(3L, TimeUnit.SECONDS);
} catch (InterruptedException ignored) {
// Ignore the interrupt during teardown.
}
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.

medium

Using checkStateNotNull(executor) in a finally block is risky. If executor is null (for example, if setup() failed before the executor was initialized), this will throw an IllegalStateException. In Java, an exception thrown in a finally block will suppress any exception thrown from the try block, making debugging difficult. It is safer to use a null check here to ensure teardown() is idempotent and doesn't mask other errors. Additionally, the result of awaitTermination can be called without assigning it to a variable, avoiding a potential name conflict with the catch parameter.

        if (executor != null) {
          executor.shutdown();
          try {
            executor.awaitTermination(3L, TimeUnit.SECONDS);
          } catch (InterruptedException ignored) {
            // Ignore the interrupt during teardown.
          }
        }

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 8, 2026

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).

@Abacn Abacn merged commit a619a58 into apache:master May 8, 2026
16 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