---

javabrown · sduskis · commit 5b11c6e1b0e0 · 2018-12-31T12:35:29.000-05:00
yaml --- r: 13971 b: refs/heads/autosynth-container c: e9ea3d9 h: refs/heads/master i: 13969: 70017c0 13967: ac4d1bc
diff --git a/[refs] b/[refs]
@@ -113,7 +113,7 @@ refs/tags/v0.65.0: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
 refs/tags/v0.66.0: ed6a3f57cbdaa20339a1995f7d7d53b172a5b8ef
 refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: 8e86445e504cea6f99b9fb237bfd7f0e5ef8b3ce
-refs/heads/autosynth-container: 36fbd97799e222fac888ca5e643beb37d6700c77
+refs/heads/autosynth-container: e9ea3d9bacf0410ef578a9d5c2d25fcbe5955a0d
 refs/heads/autosynth-dataproc: bc74a8841bc1693d7945d991d15979df550b1fd1
 refs/heads/autosynth-monitoring: 120f508e0065f4ce39cf0e6a69a08138773f2cfb
 refs/heads/autosynth-pubsub: ed3340e32d13bb1a42ca4431cb1ad9bdaf550aa4
diff --git a/branches/autosynth-container/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/branches/autosynth-container/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();
   }
 
   /**
