Skip to content

[Release-2.70] Cherry-pick #36995 and #37003 #37017

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
shunping merged 2 commits into from
Dec 8, 2025
+7 −2
Merged

[Release-2.70] Cherry-pick #36995 and #37003 #37017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a83a536
Temporary disable a few unit tests in SpannerChangeStreamErrorTest (#…
jiangzzhu Dec 5, 2025
9abc690
Update spanner client version. (#36995)
shunping Dec 5, 2025
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 buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ class BeamModulePlugin implements Plugin<Project> {
def google_ads_version = "33.0.0"
def google_clients_version = "2.0.0"
def google_cloud_bigdataoss_version = "2.2.26"
// [bomupgrader] TODO(#35868): currently pinned, should be determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom
def google_cloud_spanner_version = "6.95.1"
// [bomupgrader] TODO(#37008): currently pinned before gcp-bom moving beyond this version, should be determined by: com.google.cloud:google-cloud-spanner, consistent with: google_cloud_platform_libraries_bom
def google_cloud_spanner_version = "6.104.0"
def google_code_gson_version = "2.10.1"
def google_oauth_clients_version = "1.34.1"
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
Expand Down
5 changes: 5 additions & 0 deletions ...t/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/SpannerChangeStreamErrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import org.joda.time.Duration;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
Expand Down Expand Up @@ -115,6 +116,7 @@ public void tearDown() throws NoSuchFieldException, IllegalAccessException {
}

@Test
@Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.")
// Error code UNAVAILABLE is retried repeatedly until the RPC times out.
public void testUnavailableExceptionRetries() throws InterruptedException {
DirectOptions options = PipelineOptionsFactory.as(DirectOptions.class);
Expand Down Expand Up @@ -155,6 +157,7 @@ public void testUnavailableExceptionRetries() throws InterruptedException {
}

@Test
@Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.")
// Error code ABORTED is retried repeatedly until it times out.
public void testAbortedExceptionRetries() throws InterruptedException {
mockSpannerService.setExecuteStreamingSqlExecutionTime(
Expand Down Expand Up @@ -218,6 +221,7 @@ public void testUnknownExceptionDoesNotRetry() {
}

@Test
@Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.")
// Error code RESOURCE_EXHAUSTED is retried repeatedly.
public void testResourceExhaustedRetry() {
mockSpannerService.setExecuteStreamingSqlExecutionTime(
Expand Down Expand Up @@ -281,6 +285,7 @@ public void testResourceExhaustedRetryWithDefaultSettings() {
}

@Test
@Ignore("https://github.com/apache/beam/issues/37002 Re-enable skipped tests.")
public void testInvalidRecordReceived() {
final Timestamp startTimestamp = Timestamp.ofTimeSecondsAndNanos(0, 1000);
final Timestamp endTimestamp =
Expand Down
Loading