diff --git a/server/src/internalClusterTest/java/org/opensearch/search/CoordinatorTimeoutIT.java b/server/src/internalClusterTest/java/org/opensearch/search/CoordinatorTimeoutIT.java index 3638f3bed92a0..0d858945c4ca0 100644 --- a/server/src/internalClusterTest/java/org/opensearch/search/CoordinatorTimeoutIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/search/CoordinatorTimeoutIT.java @@ -72,9 +72,7 @@ public void testTimeoutDuringQueryPhase() throws Exception { .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", ScriptedBlockPlugin.SCRIPT_NAME, Collections.emptyMap()))) .execute(); awaitForBlock(plugins); - logger.info("begin to sleep for " + coordinatorTimeout.getMillis() + " ms"); Thread.sleep(coordinatorTimeout.getMillis() + 100); - logger.info("wake up"); disableBlocks(plugins); SearchResponse searchResponse = searchResponseFuture.get(); assertEquals(1, searchResponse.getSuccessfulShards()); diff --git a/server/src/internalClusterTest/java/org/opensearch/search/basic/SearchWithRandomExceptionsIT.java b/server/src/internalClusterTest/java/org/opensearch/search/basic/SearchWithRandomExceptionsIT.java index e4a8ac3f705d4..8f032f69bbec7 100644 --- a/server/src/internalClusterTest/java/org/opensearch/search/basic/SearchWithRandomExceptionsIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/search/basic/SearchWithRandomExceptionsIT.java @@ -190,7 +190,7 @@ public void testRandomExceptions() throws IOException, InterruptedException, Exe } } catch (SearchPhaseExecutionException ex) { - logger.info("expected SearchPhaseException: [{}]", ex.getMessage()); + logger.info("expected SearchPhaseException: [{}]", ex); } } diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java index 4e717db9f1355..dbe4b0cd7c093 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/opensearch/action/search/SearchRequest.java @@ -279,7 +279,7 @@ public SearchRequest(StreamInput in) throws IOException { if (in.getVersion().onOrAfter(Version.V_2_12_0)) { phaseTook = in.readOptionalBoolean(); } - if (in.getVersion().onOrAfter(Version.V_2_19_0)) { + if (in.getVersion().onOrAfter(Version.V_3_0_0)) {// TODO: Change if/when we backport to 2.x coordinatorTimeout = in.readOptionalTimeValue(); } } @@ -316,7 +316,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_2_12_0)) { out.writeOptionalBoolean(phaseTook); } - if (out.getVersion().onOrAfter(Version.V_2_19_0)) { + if (out.getVersion().onOrAfter(Version.V_3_0_0)) {// TODO: Change if/when we backport to 2.x out.writeOptionalTimeValue(coordinatorTimeout); } } diff --git a/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java b/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java index faf97039974ea..427904db5634b 100644 --- a/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java +++ b/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java @@ -64,7 +64,7 @@ public class MockBigArrays extends BigArrays { * Tracking allocations is useful when debugging a leak but shouldn't be enabled by default as this would also be very costly * since it creates a new Exception every time a new array is created. */ - private static final boolean TRACK_ALLOCATIONS = false; + private static final boolean TRACK_ALLOCATIONS = true; private static final ConcurrentMap ACQUIRED_ARRAYS = new ConcurrentHashMap<>();