iframe-proxy

sinhasubham · 2026-01-05T15:36:10Z

Handle errors during stream restart in snapshot

Root Cause
When _restart_on_unavailable caught a ServiceUnavailable or resumable InternalServerError, it attempted to re-initialize the iterator immediately within the except block. If this re-initialization failed (e.g. due to a persistent transient error), the exception would propagate unhandled, breaking the retry loop.

Fix
This change modifies the logic to reset the iterator to None and continue the loop, forcing the re-initialization to occur inside the try block. This ensures that subsequent errors during restart are properly caught and retried.

Testing
Added unit tests to cover this specific behavior

gemini-code-assist · 2026-01-05T15:36:26Z

Summary of Changes

Hello @sinhasubham, I'm Gemini Code Assist¹! 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 reliability issue in the Spanner client library's snapshot iteration, where transient errors during stream restarts could lead to unhandled exceptions and premature termination of data retrieval. By refining the retry mechanism to properly re-initialize iterators after such errors, the change significantly improves the robustness and resilience of data streaming operations, preventing data loss or incomplete results due to intermittent service disruptions.

Highlights

Robust Error Handling: The pull request enhances the error handling mechanism within the _restart_on_unavailable function for Spanner snapshots, specifically addressing issues where re-initialization failures during stream restarts could break the retry loop.
Refactored Iterator Re-initialization: The logic for re-initializing iterators after catching ServiceUnavailable or resumable InternalServerError has been refactored. Instead of immediate re-initialization within the except block, the iterator is now explicitly set to None, forcing re-initialization to occur safely within the main try block on the next loop iteration.
Improved Test Coverage: New unit tests have been added to specifically cover scenarios where ServiceUnavailable or resumable InternalServerError exceptions occur during the stream restart process, ensuring the fix behaves as expected and the retry mechanism is robust.

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

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

gemini-code-assist

Code Review

This pull request effectively addresses a bug where errors during a stream restart in a snapshot were not handled correctly, which could break the retry loop. The fix of resetting the iterator to None and letting the main try block handle the re-initialization is a solid approach. The added unit tests properly cover the fixed scenario.

I've included a couple of suggestions to improve code maintainability by reducing duplication in both the implementation and the new tests. These changes should make the code cleaner and easier to manage in the future.

sakthivelmanii · 2026-01-07T06:28:56Z


        except ServiceUnavailable:
            del item_buffer[:]
-            with trace_call(


why are you removing the trace?

We aren't removing the observability; we're consolidating it. By setting iterator = None and calling continue, the loop restarts and re-enters the trace_call block at Line 111. This ensures every retry is still traced while removing the need for duplicate tracing logic inside the except blocks. By doing this we handle the problem of error inside except block which is crashing the application without going through retry mechanism.

PR created by the Librarian CLI to initialize a release. Merging this PR will auto trigger a release. Librarian Version: v1.0.0 Language Image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:b8058df4c45e9a6e07f6b4d65b458d0d059241dd34c814f151c8bf6b89211209 <details><summary>google-cloud-spanner: 3.62.0</summary> ## [3.62.0](v3.61.0...v3.62.0) (2026-01-14) ### Features * add uuid support (#1310) ([3b1792a](3b1792aa)) ### Bug Fixes * transaction_tag should be set on BeginTransactionRequest (#1463) ([3d3cea0](3d3cea0b)) * resolve pre-release dependency failures and sqlparse recursion (#1472) ([9ec95b7](9ec95b7d)) * handle errors during stream restart in snapshot (#1471) ([c066873](c0668735)) </details>

sinhasubham requested review from a team January 5, 2026 15:36

product-auto-label Bot added the size: m Pull request size is medium. label Jan 5, 2026

blunderbuss-gcf Bot assigned aakashanandg Jan 5, 2026

product-auto-label Bot added the api: spanner Issues related to the googleapis/python-spanner API. label Jan 5, 2026

gemini-code-assist Bot reviewed Jan 5, 2026

View reviewed changes

Comment thread tests/unit/test_snapshot.py

fix(spanner): handle errors during stream restart in snapshot

6659c7d

sinhasubham force-pushed the fix/rst-stream-retry branch from 698bf71 to 6659c7d Compare January 6, 2026 14:22

sakthivelmanii reviewed Jan 7, 2026

View reviewed changes

olavloite approved these changes Jan 14, 2026

View reviewed changes

sakthivelmanii approved these changes Jan 14, 2026

View reviewed changes

sinhasubham merged commit c066873 into main Jan 14, 2026
30 of 31 checks passed

sinhasubham deleted the fix/rst-stream-retry branch January 14, 2026 15:03

rahul2393 mentioned this pull request Jan 14, 2026

chore: librarian release pull request: 20260114T204223Z #1478

Merged

Sunbelt Computer Software

PL/B Language Development and Support

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(spanner): handle errors during stream restart in snapshot#1471

fix(spanner): handle errors during stream restart in snapshot#1471
sinhasubham merged 1 commit into
mainfrom
fix/rst-stream-retry

sinhasubham commented Jan 5, 2026

Uh oh!

gemini-code-assist Bot commented Jan 5, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

sakthivelmanii Jan 7, 2026

Uh oh!

sinhasubham Jan 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Conversation

sinhasubham commented Jan 5, 2026

Uh oh!

gemini-code-assist Bot commented Jan 5, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

sakthivelmanii Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

sinhasubham Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants