Skip to content

Only update the partition watermark iff the partition watermark in metadata table is smaller than the given watermark. - #36463

Merged
scwhittle merged 1 commit into
apache:masterfrom
jiangzzhu:master
Oct 10, 2025
Merged

Only update the partition watermark iff the partition watermark in metadata table is smaller than the given watermark.#36463
scwhittle merged 1 commit into
apache:masterfrom
jiangzzhu:master

Conversation

@jiangzzhu

Copy link
Copy Markdown
Contributor

The updateWatermark is called in QueryChangeStreamAction.updateWatermarkCallback. This function update the watermark in a async way, so the update order is not guaranteed.

Updated the update watermark logic so that we only move the watermark of one partition forward.

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 @jiangzzhu, 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 introduces a critical refinement to the watermark management logic within the Spanner Change Streams connector for Apache Beam. By implementing a conditional update mechanism, the system now ensures that partition watermarks only advance forward, preventing potential data consistency issues that could arise from asynchronous update operations. This enhancement improves the robustness and reliability of watermark progression in stream processing.

Highlights

  • Conditional Watermark Update: The updateWatermark method in PartitionMetadataDao now includes a check to ensure that a partition's watermark is only updated if the new watermark value is strictly greater than the currently stored watermark in the metadata table.
  • Asynchronous Safety: This change addresses potential issues with out-of-order updates from asynchronous updateWatermark calls, guaranteeing that partition watermarks always move forward monotonically and prevent regressions.
  • Improved Error Handling: Added logging to capture and report errors if the system fails to read the existing watermark from the metadata table before attempting an update.
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

Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment assign set of reviewers

@jiangzzhu
jiangzzhu force-pushed the master branch 2 times, most recently from 9ed32f1 to 4358f92 Compare October 10, 2025 03:56
…tadata table is smaller than the given watermark.
@github-actions

Copy link
Copy Markdown
Contributor

Assigning reviewers:

R: @chamikaramj for label java.
R: @nielm for label spanner.

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

@tianz101 tianz101 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.

LGTM, can you make sure Sam review and help merge? Thanks.

@scwhittle scwhittle self-assigned this Oct 10, 2025
@scwhittle

Copy link
Copy Markdown
Contributor

Fixes #36470

@scwhittle
scwhittle merged commit b9f07c9 into apache:master Oct 10, 2025
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.

3 participants