fix: moving source close to the executor (just like doConsume)

close: #6354 Signed-off-by: Steve Hawkins <[email protected]> Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Sep 25, 2024 · 71354a8 · 71354a8
1 parent 928d356
commit 71354a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 #### Bugs
 * Fix #6247: Support for proxy authentication from proxy URL user info
 * Fix #6342: UnmatchedFieldTypeModule prevents certain jackson features from working
+* Fix #6354: Prevent deadlock in okhttp AsyncBody.cancel
 
 ### 6.13.3 (2024-08-13)
 

diff --git a/httpclient-okhttp/src/main/java/io/fabric8/kubernetes/client/okhttp/OkHttpClientImpl.java b/httpclient-okhttp/src/main/java/io/fabric8/kubernetes/client/okhttp/OkHttpClientImpl.java
@@ -151,7 +151,10 @@ public CompletableFuture<Void> done() {
 
     @Override
     public void cancel() {
-      Utils.closeQuietly(source);
+      // closing from a non dispatcher thread risks deadlock because close is
+      // a long-running operation that may need to re-obtain the dispatcher lock
+      // and the thread may already be holding other locks
+      executor.execute(() -> Utils.closeQuietly(source));
       done.cancel(false);
     }
   }