diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java index 5df163ecd8..5d5498e3b6 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java @@ -524,7 +524,30 @@ public static FixedCloseableExecutorProvider create(ScheduledExecutorService exe */ @VisibleForTesting static CloseableExecutorProvider createDefaultAsyncExecutorProvider() { - return createAsyncExecutorProvider(8, 60L, TimeUnit.SECONDS); + return createAsyncExecutorProvider( + getDefaultAsyncExecutorProviderCoreThreadCount(), 60L, TimeUnit.SECONDS); + } + + @VisibleForTesting + static int getDefaultAsyncExecutorProviderCoreThreadCount() { + String propertyName = "SPANNER_ASYNC_NUM_CORE_THREADS"; + String propertyValue = System.getProperty(propertyName, "8"); + try { + int corePoolSize = Integer.parseInt(propertyValue); + if (corePoolSize < 0) { + throw SpannerExceptionFactory.newSpannerException( + ErrorCode.INVALID_ARGUMENT, + String.format( + "The value for %s must be >=0. Invalid value: %s", propertyName, propertyValue)); + } + return corePoolSize; + } catch (NumberFormatException exception) { + throw SpannerExceptionFactory.newSpannerException( + ErrorCode.INVALID_ARGUMENT, + String.format( + "The %s system property must be a valid integer. The value %s could not be parsed as an integer.", + propertyName, propertyValue)); + } } /** diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java index 7061e25575..39b6fb39b3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java @@ -63,6 +63,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Callable; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nonnull; import org.junit.Test; @@ -913,6 +914,62 @@ public void testCustomAsyncExecutorProvider() { assertSame(service, options.getAsyncExecutorProvider().getExecutor()); } + @Test + public void testAsyncExecutorProviderCoreThreadCount() throws Exception { + assertEquals(8, SpannerOptions.getDefaultAsyncExecutorProviderCoreThreadCount()); + String propertyName = "SPANNER_ASYNC_NUM_CORE_THREADS"; + assertEquals( + Integer.valueOf(8), + runWithSystemProperty( + propertyName, null, SpannerOptions::getDefaultAsyncExecutorProviderCoreThreadCount)); + assertEquals( + Integer.valueOf(16), + runWithSystemProperty( + propertyName, "16", SpannerOptions::getDefaultAsyncExecutorProviderCoreThreadCount)); + assertEquals( + Integer.valueOf(1), + runWithSystemProperty( + propertyName, "1", SpannerOptions::getDefaultAsyncExecutorProviderCoreThreadCount)); + assertThrows( + SpannerException.class, + () -> + runWithSystemProperty( + propertyName, + "foo", + SpannerOptions::getDefaultAsyncExecutorProviderCoreThreadCount)); + assertThrows( + SpannerException.class, + () -> + runWithSystemProperty( + propertyName, + "-1", + SpannerOptions::getDefaultAsyncExecutorProviderCoreThreadCount)); + assertThrows( + SpannerException.class, + () -> + runWithSystemProperty( + propertyName, "", SpannerOptions::getDefaultAsyncExecutorProviderCoreThreadCount)); + } + + static V runWithSystemProperty( + String propertyName, String propertyValue, Callable callable) throws Exception { + String currentValue = System.getProperty(propertyName); + if (propertyValue == null) { + System.clearProperty(propertyName); + } else { + System.setProperty(propertyName, propertyValue); + } + try { + return callable.call(); + } finally { + if (currentValue == null) { + System.clearProperty(propertyName); + } else { + System.setProperty(propertyName, currentValue); + } + } + } + @Test public void testDefaultNumChannelsWithGrpcGcpExtensionEnabled() { SpannerOptions options =