(beam) branch release-2.60.0 updated: Revert "Set setFailIfPoolExhausted in SessionPoolOptions for SpannerAccessor" (#32694) (#32702)

[yhu]

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch release-2.60.0
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/release-2.60.0 by this push:
     new 64854bb4a04 Revert "Set setFailIfPoolExhausted in SessionPoolOptions 
for SpannerAccessor" (#32694) (#32702)
64854bb4a04 is described below

commit 64854bb4a04f5c6becc6f254776b5754f947ebd5
Author: Niel Markwick <ni...@users.noreply.github.com>
AuthorDate: Tue Oct 8 23:15:04 2024 +0200

    Revert "Set setFailIfPoolExhausted in SessionPoolOptions for 
SpannerAccessor" (#32694) (#32702)
    
    This reverts commit efee92bf02b55bee86848a9d0d291de58cb8412a.
    
    Co-authored-by: Manit Gupta <manitgu...@google.com>
---
 .../java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java     | 5 +----
 .../java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessorTest.java | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
index 2a2b01cca9b..b37f2e58581 100644
--- 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
+++ 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
@@ -30,7 +30,6 @@ import com.google.cloud.spanner.BatchClient;
 import com.google.cloud.spanner.DatabaseAdminClient;
 import com.google.cloud.spanner.DatabaseClient;
 import com.google.cloud.spanner.DatabaseId;
-import com.google.cloud.spanner.SessionPoolOptions;
 import com.google.cloud.spanner.Spanner;
 import com.google.cloud.spanner.SpannerOptions;
 import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
@@ -233,9 +232,7 @@ public class SpannerAccessor implements AutoCloseable {
     if (credentials != null && credentials.get() != null) {
       builder.setCredentials(credentials.get());
     }
-    SessionPoolOptions sessionPoolOptions =
-        SessionPoolOptions.newBuilder().setFailIfPoolExhausted().build();
-    builder.setSessionPoolOption(sessionPoolOptions);
+
     return builder.build();
   }
 
diff --git 
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessorTest.java
 
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessorTest.java
index 70105f82053..b80fba31d3a 100644
--- 
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessorTest.java
+++ 
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessorTest.java
@@ -18,7 +18,6 @@
 package org.apache.beam.sdk.io.gcp.spanner;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -164,6 +163,5 @@ public class SpannerAccessorTest {
     assertEquals("project", options.getProjectId());
     assertEquals("test-role", options.getDatabaseRole());
     assertEquals(testCredential, options.getCredentials());
-    assertNotNull(options.getSessionPoolOptions());
   }
 }