Skip to content

[Spanner Change Streams] Match single-RPC deadline to total timeout in SpannerIO.ReadChangeStream #40616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scwhittle merged 1 commit into from
Oct 19, 2026
Merged

[Spanner Change Streams] Match single-RPC deadline to total timeout in SpannerIO.ReadChangeStream #40616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2503,8 +2503,8 @@ SpannerConfig buildChangeStreamSpannerConfig() {
.setExecuteStreamingSqlRetrySettings(
RetrySettings.newBuilder()
.setTotalTimeout(org.threeten.bp.Duration.ofMinutes(5))
.setInitialRpcTimeout(org.threeten.bp.Duration.ofMinutes(1))
.setMaxRpcTimeout(org.threeten.bp.Duration.ofMinutes(1))
.setInitialRpcTimeout(org.threeten.bp.Duration.ofMinutes(5))
.setMaxRpcTimeout(org.threeten.bp.Duration.ofMinutes(5))
.build())
.build();
}
Expand Down
52 changes: 52 additions & 0 deletions ...tform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOReadChangeStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.StatusCode.Code;
import com.google.auth.Credentials;
import com.google.cloud.Timestamp;
import com.google.cloud.spanner.DatabaseClient;
Expand All @@ -41,6 +43,7 @@
import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
import org.apache.beam.sdk.io.gcp.spanner.changestreams.MetadataSpannerConfigFactory;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableSet;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -175,6 +178,55 @@ public void testSetDirectedReadOptions() {
.getReplicaSelections(0)
.getLocation());
}

@Test
public void testDefaultRetrySettings() {
assertNull(spannerConfig.getRetryableCodes());
assertNull(spannerConfig.getExecuteStreamingSqlRetrySettings());
SpannerConfig changeStreamSpannerConfig = readChangeStream.buildChangeStreamSpannerConfig();
SpannerConfig metadataSpannerConfig =
MetadataSpannerConfigFactory.create(
changeStreamSpannerConfig, TEST_METADATA_INSTANCE, TEST_METADATA_DATABASE);
ImmutableSet<Code> expectedRetryableCodes = ImmutableSet.of(Code.UNAVAILABLE, Code.ABORTED);
RetrySettings expectedRetrySettings =
RetrySettings.newBuilder()
.setTotalTimeout(org.threeten.bp.Duration.ofMinutes(5))
.setInitialRpcTimeout(org.threeten.bp.Duration.ofMinutes(5))
.setMaxRpcTimeout(org.threeten.bp.Duration.ofMinutes(5))
.build();
assertEquals(expectedRetryableCodes, changeStreamSpannerConfig.getRetryableCodes());
assertEquals(expectedRetryableCodes, metadataSpannerConfig.getRetryableCodes());
assertEquals(
expectedRetrySettings, changeStreamSpannerConfig.getExecuteStreamingSqlRetrySettings());
assertEquals(
expectedRetrySettings, metadataSpannerConfig.getExecuteStreamingSqlRetrySettings());
}

@Test
public void testCustomRetrySettings() {
ImmutableSet<Code> customRetryableCodes = ImmutableSet.of(Code.UNAVAILABLE);
RetrySettings customRetrySettings =
RetrySettings.newBuilder()
.setTotalTimeout(org.threeten.bp.Duration.ofMinutes(10))
.setInitialRpcTimeout(org.threeten.bp.Duration.ofMinutes(10))
.setMaxRpcTimeout(org.threeten.bp.Duration.ofMinutes(10))
.build();
spannerConfig =
spannerConfig
.withRetryableCodes(customRetryableCodes)
.withExecuteStreamingSqlRetrySettings(customRetrySettings);
readChangeStream = readChangeStream.withSpannerConfig(spannerConfig);
SpannerConfig changeStreamSpannerConfig = readChangeStream.buildChangeStreamSpannerConfig();
SpannerConfig metadataSpannerConfig =
MetadataSpannerConfigFactory.create(
changeStreamSpannerConfig, TEST_METADATA_INSTANCE, TEST_METADATA_DATABASE);
assertEquals(customRetryableCodes, changeStreamSpannerConfig.getRetryableCodes());
assertEquals(customRetryableCodes, metadataSpannerConfig.getRetryableCodes());
assertEquals(
customRetrySettings, changeStreamSpannerConfig.getExecuteStreamingSqlRetrySettings());
assertEquals(
customRetrySettings, metadataSpannerConfig.getExecuteStreamingSqlRetrySettings());
}
}

/** Parameterized tests for Dialect and Partition Mode combinations. */
Expand Down
Loading