Merge pull request #2712 from mindgamer/automated-cherry-pick-of-#2693-upstream-release-18

k8s-ci-robot · web-flow · commit 409ff5773413 · 2023-06-21T10:51:41.000-07:00
cherry pick of #2693: Shutdown resync and reflect executors now in
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
@@ -158,8 +158,8 @@ public void stop() {
         reflectorFuture.cancel(true);
       }
     }
-    reflectExecutor.shutdown();
-    resyncExecutor.shutdown();
+    reflectExecutor.shutdownNow();
+    resyncExecutor.shutdownNow();
   }
 
   /** returns true if the queue has been resycned */

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ public void stop() {`
`158`	`158`	`reflectorFuture.cancel(true);`
`159`	`159`	`}`
`160`	`160`	`}`
`161`		`- reflectExecutor.shutdown();`
`162`		`- resyncExecutor.shutdown();`
	`161`	`+ reflectExecutor.shutdownNow();`
	`162`	`+ resyncExecutor.shutdownNow();`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`/** returns true if the queue has been resycned */`