fix fabric8io#4891: removing the backpressue for close

shawkins · Feb 17, 2023 · c3b0348 · c3b0348
1 parent f701b7b
commit c3b0348
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * Fix #4823: (java-generator) handle special characters in field names
 * Fix #4723: [java-generator] Fix a race in the use of JavaParser hitting large CRDs
 * Fix #4885: addresses a potential hang in the jdk client with exec stream reading
+* Fix #4891: address vertx not completely reading exec streams
 
 #### Improvements
 * Fix #3805: DeletionTimestamp and Finalizer support in Mock server.

diff --git a/httpclient-jetty/src/main/java/io/fabric8/kubernetes/client/jetty/JettyWebSocket.java b/httpclient-jetty/src/main/java/io/fabric8/kubernetes/client/jetty/JettyWebSocket.java
@@ -126,7 +126,6 @@ public void onWebSocketText(String message) {
   @Override
   public void onWebSocketClose(int statusCode, String reason) {
     closed.set(true);
-    backPressure();
     listener.onClose(this, statusCode, reason);
   }
 

diff --git a/httpclient-okhttp/src/main/java/io/fabric8/kubernetes/client/okhttp/OkHttpWebSocketImpl.java b/httpclient-okhttp/src/main/java/io/fabric8/kubernetes/client/okhttp/OkHttpWebSocketImpl.java
@@ -155,7 +155,6 @@ private void request() {
 
       @Override
       public void onClosing(okhttp3.WebSocket webSocket, int code, String reason) {
-        awaitMoreRequest();
         listener.onClose(new OkHttpWebSocketImpl(webSocket, this::request), code, reason);
       }
 

diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/http/WebSocket.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/http/WebSocket.java
@@ -33,15 +33,15 @@ default void onOpen(WebSocket webSocket) {
 
     /**
      * Called once the full text message has been built. {@link WebSocket#request()} must
-     * be called to receive more messages or onClose.
+     * be called to receive more messages.
      */
     default void onMessage(WebSocket webSocket, String text) {
       webSocket.request();
     }
 
     /**
      * Called once the full binary message has been built. {@link WebSocket#request()} must
-     * be called to receive more messages or onClose.
+     * be called to receive more messages.
      */
     default void onMessage(WebSocket webSocket, ByteBuffer bytes) {
       webSocket.request();

diff --git a/...client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ExecWebSocketListener.java b/...client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/ExecWebSocketListener.java
@@ -358,22 +358,24 @@ private void handleExitStatus(ByteBuffer bytes) {
 
   @Override
   public void onClose(WebSocket webSocket, int code, String reason) {
-    if (!exitCode.isDone()) {
-      exitCode.complete(null);
-    }
     closeWebSocketOnce(code, reason);
     //If we already called onClosed() or onFailed() before, we need to abort.
     if (!closed.compareAndSet(false, true)) {
       return;
     }
     LOGGER.debug("Exec Web Socket: On Close with code:[{}], due to: [{}]", code, reason);
-    try {
-      cleanUpOnce();
-    } finally {
-      if (listener != null) {
-        listener.onClose(code, reason);
+    serialExecutor.execute(() -> {
+      try {
+        if (!exitCode.isDone()) {
+          exitCode.complete(null);
+        }
+        cleanUpOnce();
+      } finally {
+        if (listener != null) {
+          listener.onClose(code, reason);
+        }
       }
-    }
+    });
   }
 
   @Override