From 25144e4685e56a557c46b29d6a6ef0a1c93078dc Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Tue, 12 Apr 2022 11:50:41 +1000 Subject: [PATCH 1/3] BEAM-14277: Disables Spanner change streams tests Disables the Spanner change streams tests for now. They are currently failing because they are using the default auto-scaling algorithm (throughput-based), which is not supported for change streams. We decided to disable the tests here, because we can not change the autoscaling algorithm without adding the dependency of dataflow into the tests module. Since we are soon re-enabling auto-scaling, we will also re-enable the tests when we submit the PR then. --- .../io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java | 2 ++ .../it/SpannerChangeStreamTransactionBoundariesIT.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java index 202179bd9152..29528a67c5dc 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java @@ -47,6 +47,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -84,6 +85,7 @@ public void before() { pipeline.getOptions().as(ChangeStreamTestPipelineOptions.class).setBlockOnRun(false); } + @Ignore @Test public void testReadSpannerChangeStream() { // Defines how many rows are going to be inserted / updated / deleted in the test diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java index eb5b9e3ba151..8114ebe6dfca 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java @@ -49,6 +49,7 @@ import org.joda.time.Instant; import org.junit.BeforeClass; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -83,6 +84,7 @@ public static void setup() throws InterruptedException, ExecutionException, Time databaseClient = ENV.getDatabaseClient(); } + @Ignore @Test public void testTransactionBoundaries() { LOG.info("Test pipeline: " + pipeline.toString()); From 7bf3124d3043ac252e4e01a5b9db1f5ecb78affe Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Tue, 12 Apr 2022 12:18:10 +1000 Subject: [PATCH 2/3] Update sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java Co-authored-by: emily --- .../io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java index 29528a67c5dc..786ca52b3d08 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamIT.java @@ -85,7 +85,7 @@ public void before() { pipeline.getOptions().as(ChangeStreamTestPipelineOptions.class).setBlockOnRun(false); } - @Ignore + @Ignore("BEAM-14277 Sickbay until autoscaling changes are merged") @Test public void testReadSpannerChangeStream() { // Defines how many rows are going to be inserted / updated / deleted in the test From 99cebc01967c2fe8d227819124c74a6c7d52f0d0 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Tue, 12 Apr 2022 12:18:15 +1000 Subject: [PATCH 3/3] Update sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java Co-authored-by: emily --- .../it/SpannerChangeStreamTransactionBoundariesIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java index 8114ebe6dfca..f1b6fbc3098a 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/it/SpannerChangeStreamTransactionBoundariesIT.java @@ -84,7 +84,7 @@ public static void setup() throws InterruptedException, ExecutionException, Time databaseClient = ENV.getDatabaseClient(); } - @Ignore + @Ignore("BEAM-14277 Sickbay until autoscaling changes are merged") @Test public void testTransactionBoundaries() { LOG.info("Test pipeline: " + pipeline.toString());