Merge pull request kubernetes-client#807 from ahadas/shared_thread_pool

k8s-ci-robot · web-flow · commit b4ad5c81f37b · 2019-11-22T13:24:43.000-08:00
Extract thread pool shutdown to a separate method
diff --git a/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java b/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java
@@ -178,8 +178,17 @@ public synchronized void startAllRegisteredInformers() {
         });
   }
 
-  /** Stop all registered informers. */
+  /** Stop all registered informers and shut down the thread pool. */
   public synchronized void stopAllRegisteredInformers() {
+    stopAllRegisteredInformers(true);
+  }
+
+  /**
+   * Stop all registered informers.
+   *
+   * @param shutdownThreadPool whether or not to shut down the thread pool.
+   */
+  public synchronized void stopAllRegisteredInformers(boolean shutdownThreadPool) {
     if (MapUtils.isEmpty(informers)) {
       return;
     }
@@ -190,6 +199,8 @@ public synchronized void stopAllRegisteredInformers() {
             informer.stop();
           }
         });
-    informerExecutor.shutdown();
+    if (shutdownThreadPool) {
+      informerExecutor.shutdown();
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,17 @@ public synchronized void startAllRegisteredInformers() {`
`178`	`178`	`});`
`179`	`179`	`}`
`180`	`180`
`181`		`- /** Stop all registered informers. */`
	`181`	`+ /** Stop all registered informers and shut down the thread pool. */`
`182`	`182`	`public synchronized void stopAllRegisteredInformers() {`
	`183`	`+ stopAllRegisteredInformers(true);`
	`184`	`+ }`
	`185`	`+`
	`186`	`+ /**`
	`187`	`+ * Stop all registered informers.`
	`188`	`+ *`
	`189`	`+ * @param shutdownThreadPool whether or not to shut down the thread pool.`
	`190`	`+ */`
	`191`	`+ public synchronized void stopAllRegisteredInformers(boolean shutdownThreadPool) {`
`183`	`192`	`if (MapUtils.isEmpty(informers)) {`
`184`	`193`	`return;`
`185`	`194`	`}`
`@@ -190,6 +199,8 @@ public synchronized void stopAllRegisteredInformers() {`
`190`	`199`	`informer.stop();`
`191`	`200`	`}`
`192`	`201`	`});`
`193`		`- informerExecutor.shutdown();`
	`202`	`+ if (shutdownThreadPool) {`
	`203`	`+ informerExecutor.shutdown();`
	`204`	`+ }`
`194`	`205`	`}`
`195`	`206`	`}`