xds: shutDown the scheduledExecutorService when the provider is shutd…

…own (grpc#8198) (grpc#8200)
voidzcy · May 24, 2021 · 419c191 · 419c191
1 parent f9c6d5e
commit 419c191
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/internal/certprovider/FileWatcherCertificateProvider.java b/xds/src/main/java/io/grpc/xds/internal/certprovider/FileWatcherCertificateProvider.java
@@ -82,6 +82,7 @@ public void start() {
   @Override
   public synchronized void close() {
     shutdown = true;
+    scheduledExecutorService.shutdownNow();
     if (scheduledFuture != null) {
       scheduledFuture.cancel(true);
       scheduledFuture = null;

diff --git a/xds/src/test/java/io/grpc/xds/internal/certprovider/FileWatcherCertificateProviderTest.java b/xds/src/test/java/io/grpc/xds/internal/certprovider/FileWatcherCertificateProviderTest.java
@@ -180,6 +180,7 @@ public void closeDoesNotScheduleNext() throws IOException, CertificateException
         .updateCertificate(any(PrivateKey.class), ArgumentMatchers.<X509Certificate>anyList());
     verify(mockWatcher, never()).updateTrustedRoots(ArgumentMatchers.<X509Certificate>anyList());
     verify(timeService, never()).schedule(any(Runnable.class), any(Long.TYPE), any(TimeUnit.class));
+    verify(timeService, times(1)).shutdownNow();
   }