Skip to content

Conversation

@scwhittle
Copy link
Contributor

An unbounded end timestamp is no longer allowed for the change stream query rpc. However if we reach the end timestamp we should be careful to only advance the tracker to this timestamp and not the possibly unbounded end timestamp of the range.

It is unlikely that the query would end this way due to various timeouts (rpc deadline, interruptor) but it seems that those could possibly be avoided if there were sufficient delays between calculating the query end timestamp and starting the query. A log has been added if this occurs which should only be visible if there would have previously been data loss in this way.

While modifying the file, add a TODO about marking finished as has been discussed.


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.

… only claim timestamps that have been fully processed from the restriction tracker.
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @scwhittle, 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 addresses a critical data integrity issue within the Spanner Change Streams connector. It refines the timestamp claiming and partition completion logic to prevent data loss that could occur when change stream queries reach their end timestamps, especially in cases involving previously unbounded end timestamps. The changes ensure that processing accurately resumes from the last claimed timestamp, enhancing the robustness of continuous data processing.

Highlights

  • Data Loss Prevention: Implemented a fix to prevent potential data loss in Spanner Change Streams by ensuring only fully processed timestamps are claimed from the restriction tracker.
  • Timestamp Claiming Logic: Modified the timestamp claiming mechanism to use changeStreamQueryEndTimestamp instead of the potentially unbounded endTimestamp, providing more precise control over processed data.
  • Enhanced Logging: Introduced logging to identify scenarios where a query completes due to reaching its end timestamp, which previously could have led to data loss, making such events detectable.
  • Partition Completion Refinement: Added a TODO comment to address the timing of marking partitions as finished, suggesting it should occur after a successful commit for improved robustness.
  • Process Continuation Logic: Refined the ProcessContinuation logic to resume processing if a query completes but the partition is not yet fully finished, preventing premature stopping and ensuring continuous data flow.

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

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.

@codecov
Copy link

codecov bot commented Jan 16, 2026

Codecov Report

❌ Patch coverage is 71.42857% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 57.11%. Comparing base (4dcc27d) to head (def9bf9).
⚠️ Report is 14 commits behind head on master.

Files with missing lines Patch % Lines
.../changestreams/action/QueryChangeStreamAction.java 71.42% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master   #37326      +/-   ##
============================================
+ Coverage     55.16%   57.11%   +1.95%     
- Complexity     1676     3517    +1841     
============================================
  Files          1068     1228     +160     
  Lines        167257   189034   +21777     
  Branches       1208     3657    +2449     
============================================
+ Hits          92261   107964   +15703     
- Misses        72816    77653    +4837     
- Partials       2180     3417    +1237     
Flag Coverage Δ
java 70.71% <71.42%> (+3.33%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link
Contributor

Assigning reviewers:

R: @ahmedabu98 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).

if (tracker.tryClaim(endTimestamp)) {
LOG.debug(
"[{}] change stream completed successfully up to {}", token, changeStreamQueryEndTimestamp);
if (!tracker.tryClaim(changeStreamQueryEndTimestamp)) {
Copy link

@tianz101 tianz101 Jan 16, 2026

Choose a reason for hiding this comment

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

Sam, "An unbounded end timestamp is no longer allowed for the change stream query rpc. However if we reach the end timestamp we should be careful to only advance the tracker to this timestamp and not the possibly unbounded end timestamp of the range." Just a caution to confirm with you:

  1. The dataflow pipeline can still be configured with bounded endTs and unbounded endTs
  2. But no matter how the pipeline endTs is configured, here dataflow always break down to use endTs=now()+2m to query spanner change stream.
  3. We should only claim now()+2m if the query is successful.

return ProcessContinuation.stop();
}

if (changeStreamQueryEndTimestamp.equals(endTimestamp)) {

Choose a reason for hiding this comment

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

Should here be >= or just = or no difference?

Copy link
Contributor

Choose a reason for hiding this comment

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

This seems not correct if we have partition terminate case. changeStreamQueryEndTimestamp will not be equal to endTimestamp for terminated partition, so the partition will not be marked finished.

@jiangzzhu
Copy link
Contributor

Thanks @scwhittle !

We are able to reproduce the partition marked finished early, having potential data loss by https://github.com/apache/beam/pull/37339/files (artificial delay the query).

We are wondering if the easy fix would be only call getNextReadChangeStreamEndTimestamp immediately before changeStreamQuery, like
https://github.com/apache/beam/pull/37338/files

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