fix: swallow rejected execution after shutdown

closes: fabric8io#6059 (cherry picked from commit 1ac6b9a) Signed-off-by: Marc Nuri <[email protected]>
manusa · Jul 2, 2024 · d264884 · d264884
1 parent 91c7f77
commit d264884
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## CHANGELOG
 
+### 6.13.1 (2024-07-02)
+
+#### Bugs
+* Fix #6059: Swallow rejected execution from internal usage of the informer executor
+
 ### 6.13.0 (2024-05-29)
 
 #### Bugs

diff --git a/...lient/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStore.java b/...lient/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorStore.java
@@ -113,7 +113,7 @@ public void retainAll(Set<String> nextKeys, Consumer<Executor> cacheStateComplet
       }
     });
     if (cacheStateComplete != null) {
-      cacheStateComplete.accept(this.processor::execute);
+      cacheStateComplete.accept(this.processor::executeIfPossible);
     }
   }
 

diff --git a/...ient/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java b/...ient/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java
@@ -175,7 +175,11 @@ public ProcessorListener<T> addProcessorListener(ResourceEventHandler<? super T>
     }
   }
 
-  public void execute(Runnable runnable) {
-    this.executor.execute(runnable);
+  public void executeIfPossible(Runnable runnable) {
+    try {
+      this.executor.execute(runnable);
+    } catch (RejectedExecutionException e) {
+      // already shutdown
+    }
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         });
         if (cacheStateComplete != null) {
-          cacheStateComplete.accept(this.processor::execute);
+          cacheStateComplete.accept(this.processor::executeIfPossible);
         }
       }
@@ Expand Down @@