Skip to content

Commit

Permalink
test: use unique name for threads in test (#1343)
Browse files Browse the repository at this point in the history
* test: use unique name for threads in test

The tests that check that a Spanner instance closes all threads that it is
using was counting the total number of threads with a fixed thread name. That
also meant that if any other test would fail to (timely) close its own threads,
the thread tests could fail as a result. This is now mitigated by using unique
names for the threads for the tests, so the test can check only for its own
threads instead of all Spanner threads. The additional option that is added to
SpannerOptions is package-private, which means that the tests also need to
move to the same package. The thread tests have therefore been moved to a
separate file in the normal Spanner package.

* fix: skip teardown if test is skipped

* fix: use NoCredentials
  • Loading branch information
olavloite committed Aug 11, 2021
1 parent 300837f commit e300239
Show file tree
Hide file tree
Showing 4 changed files with 346 additions and 201 deletions.
Expand Up @@ -97,6 +97,7 @@ public class SpannerOptions extends ServiceOptions<Spanner, SpannerOptions> {
private final SessionPoolOptions sessionPoolOptions;
private final int prefetchChunks;
private final int numChannels;
private final String transportChannelExecutorThreadNameFormat;
private final ImmutableMap<String, String> sessionLabels;
private final SpannerStubSettings spannerStubSettings;
private final InstanceAdminStubSettings instanceAdminStubSettings;
Expand Down Expand Up @@ -553,6 +554,7 @@ private SpannerOptions(Builder builder) {
MAX_CHANNELS,
numChannels);

transportChannelExecutorThreadNameFormat = builder.transportChannelExecutorThreadNameFormat;
channelProvider = builder.channelProvider;
channelConfigurator = builder.channelConfigurator;
interceptorProvider = builder.interceptorProvider;
Expand Down Expand Up @@ -666,6 +668,8 @@ public static class Builder
/** By default, we create 4 channels per {@link SpannerOptions} */
private int numChannels = 4;

private String transportChannelExecutorThreadNameFormat = "Cloud-Spanner-TransportChannel-%d";

private int prefetchChunks = DEFAULT_PREFETCH_CHUNKS;
private SessionPoolOptions sessionPoolOptions;
private ImmutableMap<String, String> sessionLabels;
Expand Down Expand Up @@ -720,6 +724,8 @@ private Builder() {
this.emulatorHost = null;
}
this.numChannels = options.numChannels;
this.transportChannelExecutorThreadNameFormat =
options.transportChannelExecutorThreadNameFormat;
this.sessionPoolOptions = options.sessionPoolOptions;
this.prefetchChunks = options.prefetchChunks;
this.sessionLabels = options.sessionLabels;
Expand Down Expand Up @@ -793,6 +799,13 @@ public Builder setNumChannels(int numChannels) {
return this;
}

/** Sets the name format for transport channel threads that should be used by this instance. */
Builder setTransportChannelExecutorThreadNameFormat(
String transportChannelExecutorThreadNameFormat) {
this.transportChannelExecutorThreadNameFormat = transportChannelExecutorThreadNameFormat;
return this;
}

/**
* Sets the options for managing the session pool. If not specified then the default {@code
* SessionPoolOptions} is used.
Expand Down Expand Up @@ -1168,6 +1181,10 @@ public int getNumChannels() {
return numChannels;
}

public String getTransportChannelExecutorThreadNameFormat() {
return transportChannelExecutorThreadNameFormat;
}

public SessionPoolOptions getSessionPoolOptions() {
return sessionPoolOptions;
}
Expand Down
Expand Up @@ -343,7 +343,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
new ManagedInstantiatingExecutorProvider(
new ThreadFactoryBuilder()
.setDaemon(true)
.setNameFormat("Cloud-Spanner-TransportChannel-%d")
.setNameFormat(options.getTransportChannelExecutorThreadNameFormat())
.build());
// First check if SpannerOptions provides a TransportChannelProvider. Create one
// with information gathered from SpannerOptions if none is provided
Expand Down
@@ -0,0 +1,328 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.spanner;

import static com.google.common.truth.Truth.assertThat;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeTrue;

import com.google.cloud.NoCredentials;
import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
import com.google.cloud.spanner.admin.database.v1.MockDatabaseAdminImpl;
import com.google.cloud.spanner.admin.instance.v1.MockInstanceAdminImpl;
import com.google.common.base.Stopwatch;
import com.google.protobuf.ListValue;
import com.google.spanner.admin.database.v1.Database;
import com.google.spanner.admin.database.v1.DatabaseName;
import com.google.spanner.admin.instance.v1.Instance;
import com.google.spanner.admin.instance.v1.InstanceConfigName;
import com.google.spanner.admin.instance.v1.InstanceName;
import com.google.spanner.v1.*;
import com.google.spanner.v1.StructType.Field;
import io.grpc.*;
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

/** Tests that opening and closing multiple Spanner instances does not leak any threads. */
@RunWith(JUnit4.class)
public class SpannerThreadsTest {

private static final Statement SELECT1AND2 =
Statement.of("SELECT 1 AS COL1 UNION ALL SELECT 2 AS COL1");
private static final ResultSetMetadata SELECT1AND2_METADATA =
ResultSetMetadata.newBuilder()
.setRowType(
StructType.newBuilder()
.addFields(
Field.newBuilder()
.setName("COL1")
.setType(
com.google.spanner.v1.Type.newBuilder()
.setCode(TypeCode.INT64)
.build())
.build())
.build())
.build();
private static final com.google.spanner.v1.ResultSet SELECT1_RESULTSET =
com.google.spanner.v1.ResultSet.newBuilder()
.addRows(
ListValue.newBuilder()
.addValues(com.google.protobuf.Value.newBuilder().setStringValue("1").build())
.build())
.addRows(
ListValue.newBuilder()
.addValues(com.google.protobuf.Value.newBuilder().setStringValue("2").build())
.build())
.setMetadata(SELECT1AND2_METADATA)
.build();

private static MockSpannerServiceImpl mockSpanner;
private static MockInstanceAdminImpl mockInstanceAdmin;
private static MockDatabaseAdminImpl mockDatabaseAdmin;
private static Server server;
private static InetSocketAddress address;

@BeforeClass
public static void startServer() throws IOException {
assumeTrue(
"Skip tests when emulator is enabled as this test interferes with the check whether the emulator is running",
System.getenv("SPANNER_EMULATOR_HOST") == null);

mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.query(SELECT1AND2, SELECT1_RESULTSET));

mockInstanceAdmin = new MockInstanceAdminImpl();
mockDatabaseAdmin = new MockDatabaseAdminImpl();
address = new InetSocketAddress("localhost", 0);
server =
NettyServerBuilder.forAddress(address)
.addService(mockSpanner)
.addService(mockInstanceAdmin)
.addService(mockDatabaseAdmin)
.build()
.start();
}

@AfterClass
public static void stopServer() throws InterruptedException {
if (server != null) {
server.shutdown();
server.awaitTermination();
}
}

@After
public void reset() {
mockSpanner.reset();
}

private static final int NUMBER_OF_TEST_RUNS = 2;
private static final int NUM_THREADS_PER_CHANNEL = 4;
private static final String THREAD_PATTERN = "%s-[0-9]+";

private static String generateRandomThreadNameFormat() {
return UUID.randomUUID() + "-%d";
}

@Test
public void testCloseAllThreadsWhenClosingSpanner() throws InterruptedException {
String threadName = generateRandomThreadNameFormat();
int initialNumberOfThreads = getNumberOfThreadsWithName(threadName, false, 0);
assertEquals(0, initialNumberOfThreads);

for (int i = 0; i < NUMBER_OF_TEST_RUNS; i++) {
// Create Spanner instance.
SpannerOptions options = createSpannerOptions(threadName);
Spanner spanner = options.getService();
// Get a database client and do a query. This should initiate threads for the Spanner service.
DatabaseClient client =
spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));
List<ResultSet> resultSets = new ArrayList<>();
// SpannerStub affiliates a channel with a session, so we need to use multiple sessions
// to ensure we also hit multiple channels.
for (int i2 = 0; i2 < options.getSessionPoolOptions().getMaxSessions(); i2++) {
ResultSet rs = client.singleUse().executeQuery(SELECT1AND2);
// Execute ResultSet#next() to send the query to Spanner.
rs.next();
// Delay closing the result set in order to force the use of multiple sessions.
// As each session is linked to one transport channel, using multiple different
// sessions should initialize multiple transport channels.
resultSets.add(rs);
// Check whether the number of expected threads has been reached.
if (getNumberOfThreadsWithName(threadName, false, initialNumberOfThreads)
== options.getNumChannels() * NUM_THREADS_PER_CHANNEL + initialNumberOfThreads) {
break;
}
}
for (ResultSet rs : resultSets) {
rs.close();
}
// Then do a request to the InstanceAdmin service and check the number of threads.
// Doing a request should initialize a thread pool for the underlying InstanceAdminClient.
for (int i2 = 0; i2 < options.getNumChannels() * 2; i2++) {
mockGetInstanceResponse();
InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
instanceAdminClient.getInstance("projects/[PROJECT]/instances/[INSTANCE]");
}
// Then do a request to the DatabaseAdmin service and check the number of threads.
// Doing a request should initialize a thread pool for the underlying DatabaseAdminClient.
for (int i2 = 0; i2 < options.getNumChannels() * 2; i2++) {
mockGetDatabaseResponse();
DatabaseAdminClient databaseAdminClient = spanner.getDatabaseAdminClient();
databaseAdminClient.getDatabase("projects/[PROJECT]/instances/[INSTANCE]", "[DATABASE]");
}
// Now close the Spanner instance and check whether the threads are shutdown or not.
spanner.close();
// Wait for up to two seconds to allow the threads to actually shutdown.
Stopwatch watch = Stopwatch.createStarted();
while (getNumberOfThreadsWithName(threadName, false, initialNumberOfThreads)
> initialNumberOfThreads
&& watch.elapsed(TimeUnit.SECONDS) < 2) {
Thread.sleep(10L);
}
assertThat(
getNumberOfThreadsWithName(threadName, true, initialNumberOfThreads),
is(equalTo(initialNumberOfThreads)));
}
}

/**
* Tests that multiple open {@link Spanner} objects at the same time does not share any executors
* or worker threads, and that all of them are shutdown when the {@link Spanner} object is closed.
*/
@Test
public void testMultipleOpenSpanners() throws InterruptedException {
String threadName = generateRandomThreadNameFormat();
List<Spanner> spanners = new ArrayList<>();
int initialNumberOfThreads = getNumberOfThreadsWithName(threadName, false, 0);
assertEquals(0, initialNumberOfThreads);

for (int openSpanners = 1; openSpanners <= 3; openSpanners++) {
// Create Spanner instance.
SpannerOptions options = createSpannerOptions(threadName);
Spanner spanner = options.getService();
spanners.add(spanner);
// Get a database client and do a query. This should initiate threads for the Spanner service.
DatabaseClient client =
spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));
List<ResultSet> resultSets = new ArrayList<>();
// SpannerStub affiliates a channel with a session, so we need to use multiple sessions
// to ensure we also hit multiple channels.
for (int sessionCount = 0;
sessionCount < options.getSessionPoolOptions().getMaxSessions()
&& getNumberOfThreadsWithName(threadName, false, initialNumberOfThreads)
< options.getNumChannels() * NUM_THREADS_PER_CHANNEL * openSpanners
+ initialNumberOfThreads;
sessionCount++) {
ResultSet resultSet = client.singleUse().executeQuery(SELECT1AND2);
// Execute ResultSet#next() to send the query to Spanner.
resultSet.next();
// Delay closing the result set in order to force the use of multiple sessions.
// As each session is linked to one transport channel, using multiple different
// sessions should initialize multiple transport channels.
resultSets.add(resultSet);
}
for (ResultSet resultSet : resultSets) {
resultSet.close();
}
}
for (Spanner spanner : spanners) {
spanner.close();
}
// Wait a little to allow the threads to actually shutdown.
Stopwatch watch = Stopwatch.createStarted();
while (getNumberOfThreadsWithName(threadName, false, initialNumberOfThreads)
> initialNumberOfThreads
&& watch.elapsed(TimeUnit.SECONDS) < 5) {
Thread.sleep(10L);
}
assertEquals(
initialNumberOfThreads,
getNumberOfThreadsWithName(threadName, true, initialNumberOfThreads));
}

private static SpannerOptions createSpannerOptions(String threadNameFormat) {
String endpoint = address.getHostString() + ":" + server.getPort();
return SpannerOptions.newBuilder()
.setProjectId("[PROJECT]")
// Set a custom channel configurator to allow http instead of https.
.setChannelConfigurator(
input -> {
input.usePlaintext();
return input;
})
.setHost("http://" + endpoint)
.setCredentials(NoCredentials.getInstance())
.setTransportChannelExecutorThreadNameFormat(threadNameFormat)
.build();
}

private int getNumberOfThreadsWithName(String serviceName, boolean dumpStack, int expected) {
Pattern pattern = Pattern.compile(String.format(THREAD_PATTERN, serviceName));
ThreadGroup group = Thread.currentThread().getThreadGroup();
while (group.getParent() != null) {
group = group.getParent();
}
Thread[] threads = new Thread[100 * NUMBER_OF_TEST_RUNS];
int numberOfThreads = group.enumerate(threads);
int res = 0;
List<Thread> found = new ArrayList<>();
for (int i = 0; i < numberOfThreads; i++) {
if (pattern.matcher(threads[i].getName()).matches()) {
if (dumpStack) {
found.add(threads[i]);
}
res++;
}
}
if (dumpStack && res > expected) {
found.stream().forEach(t -> dumpThread(t));
}
return res;
}

private void dumpThread(Thread thread) {
StringBuilder dump = new StringBuilder();
dump.append('"');
dump.append(thread.getName());
dump.append("\" ");
final Thread.State state = thread.getState();
dump.append("\n java.lang.Thread.State: ");
dump.append(state);
final StackTraceElement[] stackTraceElements = thread.getStackTrace();
for (final StackTraceElement stackTraceElement : stackTraceElements) {
dump.append("\n at ");
dump.append(stackTraceElement);
}
dump.append("\n\n");
System.out.print(dump.toString());
}

private void mockGetInstanceResponse() {
InstanceName name2 = InstanceName.of("[PROJECT]", "[INSTANCE]");
InstanceConfigName config = InstanceConfigName.of("[PROJECT]", "[INSTANCE_CONFIG]");
String displayName = "displayName1615086568";
int nodeCount = 1539922066;
Instance expectedResponse =
Instance.newBuilder()
.setName(name2.toString())
.setConfig(config.toString())
.setDisplayName(displayName)
.setNodeCount(nodeCount)
.build();
mockInstanceAdmin.addResponse(expectedResponse);
}

private void mockGetDatabaseResponse() {
DatabaseName name2 = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
Database expectedResponse = Database.newBuilder().setName(name2.toString()).build();
mockDatabaseAdmin.addResponse(expectedResponse);
}
}

0 comments on commit e300239

Please sign in to comment.