From b69d23de5bae323850015b0a4d0f6f7216168d5e Mon Sep 17 00:00:00 2001
From: Yang Wang <yang.wang@elastic.co>
Date: Tue, 22 Oct 2024 10:34:38 +1100
Subject: [PATCH] [Test] Flush response body for progress (#115177) (#115209)

In JDK23, response headers are no longer always immediately sent. See
also https://bugs.openjdk.org/browse/JDK-8331847 This PR adds flush call
for the response body to make progress.

Resolves: #115145 Resolves: #115164
(cherry picked from commit 8c23fd77122cea2e235718034ddfcb4a2e945d92)
---
 .../repositories/s3/S3BlobContainerRetriesTests.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java b/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java
index 1443ff704efd1..35359a116bccc 100644
--- a/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java
+++ b/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java
@@ -573,16 +573,16 @@ public void handle(HttpExchange exchange) throws IOException {
                         ),
                         -1
                     );
+                    exchange.getResponseBody().flush();
                 } else if (randomBoolean()) {
                     final var bytesSent = sendIncompleteContent(exchange, bytes);
                     if (bytesSent < meaningfulProgressBytes) {
                         failuresWithoutProgress += 1;
-                    } else {
-                        exchange.getResponseBody().flush();
                     }
                 } else {
                     failuresWithoutProgress += 1;
                 }
+                exchange.getResponseBody().flush();
                 exchange.close();
             }
         }
@@ -627,6 +627,7 @@ public void handle(HttpExchange exchange) throws IOException {
                 failureCount += 1;
                 Streams.readFully(exchange.getRequestBody());
                 sendIncompleteContent(exchange, bytes);
+                exchange.getResponseBody().flush();
                 exchange.close();
             }
         }