Merge pull request #1627 from aaruna/shutdownResyncExecutorInController

k8s-ci-robot · web-flow · commit 11986f2fa90a · 2021-04-02T09:06:11.000-07:00
Fix name and shutdown resync executor in Controller.shutdown
diff --git a/util/src/main/java/io/kubernetes/client/informer/cache/Controller.java b/util/src/main/java/io/kubernetes/client/informer/cache/Controller.java
@@ -87,7 +87,7 @@ public Controller(
     // starts one daemon thread for resync
     this.resyncExecutor =
         Executors.newSingleThreadScheduledExecutor(
-            Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
+            Threads.threadFactory("controller-resync-" + apiTypeClass.getName() + "-%d"));
   }
 
   public Controller(
@@ -139,6 +139,7 @@ public void stop() {
       }
     }
     reflectExecutor.shutdown();
+    resyncExecutor.shutdown();
   }
 
   /** returns true if the queue has been resycned */

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public Controller(`
`87`	`87`	`// starts one daemon thread for resync`
`88`	`88`	`this.resyncExecutor =`
`89`	`89`	`Executors.newSingleThreadScheduledExecutor(`
`90`		`- Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));`
	`90`	`+ Threads.threadFactory("controller-resync-" + apiTypeClass.getName() + "-%d"));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public Controller(`
`@@ -139,6 +139,7 @@ public void stop() {`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`	`reflectExecutor.shutdown();`
	`142`	`+ resyncExecutor.shutdown();`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`/** returns true if the queue has been resycned */`