Skip to content

Commit 207787a

Browse files
authored
Revert PR #134086 (#134738)
Workarounds #134736 by reverting PR #134086 This is not a fix, but an attempt to quiet down CI while we search for the reason of the failure.
1 parent 8cb29e0 commit 207787a

File tree

1 file changed

+4
-42
lines changed
  • x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq

1 file changed

+4
-42
lines changed

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.Version;
1616
import org.elasticsearch.client.Request;
1717
import org.elasticsearch.client.Response;
18-
import org.elasticsearch.client.ResponseListener;
1918
import org.elasticsearch.client.RestClient;
2019
import org.elasticsearch.common.settings.Settings;
2120
import org.elasticsearch.core.IOUtils;
@@ -41,8 +40,6 @@
4140
import java.util.Locale;
4241
import java.util.Optional;
4342
import java.util.Set;
44-
import java.util.concurrent.CompletableFuture;
45-
import java.util.concurrent.ExecutionException;
4643
import java.util.regex.Pattern;
4744
import java.util.stream.Collectors;
4845

@@ -251,7 +248,10 @@ static RestClient twoClients(RestClient localClient, RestClient remoteClient) th
251248
return bulkClient.performRequest(request);
252249
} else {
253250
Request[] clones = cloneRequests(request, 2);
254-
return runInParallel(localClient, remoteClient, clones);
251+
Response resp1 = remoteClient.performRequest(clones[0]);
252+
Response resp2 = localClient.performRequest(clones[1]);
253+
assertEquals(resp1.getStatusLine().getStatusCode(), resp2.getStatusLine().getStatusCode());
254+
return resp2;
255255
}
256256
});
257257
doAnswer(invocation -> {
@@ -286,44 +286,6 @@ static Request[] cloneRequests(Request orig, int numClones) throws IOException {
286286
return clones;
287287
}
288288

289-
/**
290-
* Run {@link #cloneRequests cloned} requests in parallel.
291-
*/
292-
static Response runInParallel(RestClient localClient, RestClient remoteClient, Request[] clones) throws Throwable {
293-
CompletableFuture<Response> remoteResponse = new CompletableFuture<>();
294-
CompletableFuture<Response> localResponse = new CompletableFuture<>();
295-
remoteClient.performRequestAsync(clones[0], new ResponseListener() {
296-
@Override
297-
public void onSuccess(Response response) {
298-
remoteResponse.complete(response);
299-
}
300-
301-
@Override
302-
public void onFailure(Exception exception) {
303-
remoteResponse.completeExceptionally(exception);
304-
}
305-
});
306-
localClient.performRequestAsync(clones[1], new ResponseListener() {
307-
@Override
308-
public void onSuccess(Response response) {
309-
localResponse.complete(response);
310-
}
311-
312-
@Override
313-
public void onFailure(Exception exception) {
314-
localResponse.completeExceptionally(exception);
315-
}
316-
});
317-
try {
318-
Response remote = remoteResponse.get();
319-
Response local = localResponse.get();
320-
assertEquals(remote.getStatusLine().getStatusCode(), local.getStatusLine().getStatusCode());
321-
return local;
322-
} catch (ExecutionException e) {
323-
throw e.getCause();
324-
}
325-
}
326-
327289
/**
328290
* Convert FROM employees ... => FROM *:employees,employees
329291
*/

0 commit comments

Comments
 (0)