Skip to content

[Release-2.74] Cherry-pick #38695 into release branch#38727

Merged
Abacn merged 2 commits into
apache:release-2.74from
Abacn:cp-38695
May 28, 2026
Merged

[Release-2.74] Cherry-pick #38695 into release branch#38727
Abacn merged 2 commits into
apache:release-2.74from
Abacn:cp-38695

Conversation

@Abacn
Copy link
Copy Markdown
Contributor

@Abacn Abacn commented May 28, 2026

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.

…OnHeartbeat (apache#38695)

This meant that low latency mode for heartbeats was enabled by default and disabled in low latency mode instead of the desired opposite.
@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 performs a cherry-pick of a bug fix from the main branch into the release-2.74 branch. The change corrects the conditional logic governing how heartbeat records handle process continuation, ensuring that the system behaves as expected when query cancellation is configured.

Highlights

  • Logic Correction: Swapped the return logic in HeartbeatRecordAction to correctly handle process continuation when cancelQueryOnHeartbeat is enabled.
  • Test Updates: Updated unit tests in HeartbeatRecordActionTest to reflect the corrected logic for process continuation.
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 inverts the ternary logic in HeartbeatRecordAction.java when returning a ProcessContinuation based on the cancelQueryOnHeartbeat flag. It now returns Optional.of(ProcessContinuation.resume()) when the flag is true, and Optional.empty() when it is false. The corresponding unit tests in HeartbeatRecordActionTest.java have been updated to reflect this change. There are no review comments to address.

upgrade gradle action to enable the CI - 5.0.0 was removed by apache/infrastructure-actions@9ef334e
@Abacn
Copy link
Copy Markdown
Contributor Author

Abacn commented May 28, 2026

R: @aIbrahiim

@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

@Abacn
Copy link
Copy Markdown
Contributor Author

Abacn commented May 28, 2026

PreCommit Java GCP IO Direct is green on HEAD with this change, merging for now. Have another cherry-pick PR also going to test with

@Abacn Abacn merged commit 865955a into apache:release-2.74 May 28, 2026
17 checks passed
@Abacn Abacn deleted the cp-38695 branch May 28, 2026 15:31
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.

3 participants