test: try with dynamic test

GoogleCloudPlatform · Feb 15, 2024 · 4493cc5 · 4493cc5
1 parent 56e762c
commit 4493cc5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/com/google/cloud/spanner/pgadapter/ConnectionHandler.java b/src/main/java/com/google/cloud/spanner/pgadapter/ConnectionHandler.java
@@ -399,7 +399,9 @@ && getServer().getOptions().getSslMode().isSslEnabled()
               String.format(
                   "Exception on connection handler with ID %s for client %s: %s",
                   getName(),
-                  socket == null ? "(none)" : socket.getInetAddress().getHostAddress(),
+                  socket == null || socket.getInetAddress() == null
+                      ? "(none)"
+                      : socket.getInetAddress().getHostAddress(),
                   e));
     } finally {
       if (result != RunConnectionState.RESTART_WITH_SSL) {

diff --git a/src/main/java/com/google/cloud/spanner/pgadapter/ProxyServer.java b/src/main/java/com/google/cloud/spanner/pgadapter/ProxyServer.java
@@ -42,7 +42,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -85,7 +85,12 @@ public class ProxyServer extends AbstractApiService {
   private final AtomicInteger debugMessageCount = new AtomicInteger();
 
   private final ExecutorService createConnectionHandlerExecutor =
-      new ThreadPoolExecutor(1, Integer.MAX_VALUE, 20L, TimeUnit.SECONDS, new SynchronousQueue<>());
+      new ThreadPoolExecutor(
+          1,
+          Runtime.getRuntime().availableProcessors(),
+          20L,
+          TimeUnit.SECONDS,
+          new LinkedBlockingQueue<>());
 
   /**
    * Instantiates the ProxyServer from CLI-gathered metadata.

diff --git a/src/test/java/com/google/cloud/spanner/pgadapter/JdbcSimpleModeMockServerTest.java b/src/test/java/com/google/cloud/spanner/pgadapter/JdbcSimpleModeMockServerTest.java
@@ -785,7 +785,7 @@ public void testImplicitBatchOfClientSideStatements() throws SQLException {
 
   @Test
   public void testConnectStorm() throws Exception {
-    int numThreads = 1000;
+    int numThreads = Runtime.getRuntime().availableProcessors() * 10;
     ListeningExecutorService service =
         MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(numThreads));
     List<ListenableFuture<Void>> futures = new ArrayList<>(numThreads);