---

javabrown · sduskis · commit c0fedb0a8a66 · 2018-12-31T12:35:29.000-05:00
yaml --- r: 13103 b: refs/heads/autosynth-spanner c: e9ea3d9 h: refs/heads/master i: 13101: 4b3e152 13099: 6b7f4c2 13095: 9123119 13087: 33674e2
diff --git a/[refs] b/[refs]
@@ -140,7 +140,7 @@ refs/heads/autosynth-os-login: daa910328b954bbe87068f684a3088ed910f1ddf
 refs/heads/autosynth-redis: 4c68cb0fbc599124e717ab3f24bd8a8a5d085ca9
 refs/heads/autosynth-scheduler: 2f0fe714a8541dc72f88b45bddd8748e5f21cf29
 refs/heads/autosynth-securitycenter: 8e95447ccb176c3648880ee0cb926cd1f4065156
-refs/heads/autosynth-spanner: 36fbd97799e222fac888ca5e643beb37d6700c77
+refs/heads/autosynth-spanner: e9ea3d9bacf0410ef578a9d5c2d25fcbe5955a0d
 refs/heads/autosynth-speech: 631df42a628621fe42eb4974c9eb725b2fe8e473
 refs/heads/autosynth-tasks: afc9f4da54964dea5e7f3a9b164db282fc35db5c
 refs/heads/autosynth-texttospeech: a447278ab2ec3975aab3b641549c6780eac0a07a
diff --git a/branches/autosynth-spanner/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/branches/autosynth-spanner/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
@@ -107,6 +107,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import org.threeten.bp.Duration;
 
@@ -139,6 +140,8 @@ public class GapicSpannerRpc implements SpannerRpc {
   private final Duration checkInterval =
       systemProperty(PROPERTY_PERIOD_SECONDS, DEFAULT_PERIOD_SECONDS);
 
+  private final ScheduledExecutorService spannerWatchdog;
+
   public static GapicSpannerRpc create(SpannerOptions options) {
     return new GapicSpannerRpc(options);
   }
@@ -191,14 +194,15 @@ public GapicSpannerRpc(SpannerOptions options) {
     CredentialsProvider credentialsProvider =
         GrpcTransportOptions.setUpCredentialsProvider(options);
 
+    spannerWatchdog =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder()
+                .setDaemon(true)
+                .setNameFormat("Cloud-Spanner-WatchdogProvider-%d")
+                .build());
     WatchdogProvider watchdogProvider =
         InstantiatingWatchdogProvider.create()
-            .withExecutor(
-                Executors.newSingleThreadScheduledExecutor(
-                    new ThreadFactoryBuilder()
-                        .setDaemon(true)
-                        .setNameFormat("Cloud-Spanner-WatchdogProvider-%d")
-                        .build()))
+            .withExecutor(spannerWatchdog)
             .withCheckInterval(checkInterval)
             .withClock(NanoClock.getDefaultClock());
 
@@ -572,6 +576,7 @@ public void shutdown() {
     this.spannerStub.close();
     this.instanceAdminStub.close();
     this.databaseAdminStub.close();
+    this.spannerWatchdog.shutdown();
   }
 
   /**
