---

javabrown · sduskis · commit 763edc7e1783 · 2018-12-31T12:35:29.000-05:00
yaml --- r: 16341 b: refs/heads/autosynth-iot c: e9ea3d9 h: refs/heads/master i: 16339: 62c73b9
diff --git a/[refs] b/[refs]
@@ -133,7 +133,7 @@ refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
 refs/heads/autosynth-dialogflow: d7477419376eac9b6dcc7dbcede581152527351d
 refs/heads/autosynth-errorreporting: 9891e73a56af7c097829ca7a521b0e862ba6af30
 refs/heads/autosynth-firestore: ddb29f8ee445a938fc40be8227dea87b3f508ab3
-refs/heads/autosynth-iot: 36fbd97799e222fac888ca5e643beb37d6700c77
+refs/heads/autosynth-iot: e9ea3d9bacf0410ef578a9d5c2d25fcbe5955a0d
 refs/heads/autosynth-kms: dcc6e15d68759010c8735cc868135bd7e6c1cc5f
 refs/heads/autosynth-language: 8972866b016473559702424205ce5569de47b34d
 refs/heads/autosynth-os-login: daa910328b954bbe87068f684a3088ed910f1ddf
diff --git a/branches/autosynth-iot/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/branches/autosynth-iot/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();
   }
 
   /**
