Skip to content

Commit 8a2e7cd

Browse files
committed
test
1 parent ad0b8ed commit 8a2e7cd

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

server/src/internalClusterTest/java/org/opensearch/search/CoordinatorTimeoutIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ public void testTimeoutDuringQueryPhase() throws Exception {
7272
.setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", ScriptedBlockPlugin.SCRIPT_NAME, Collections.emptyMap())))
7373
.execute();
7474
awaitForBlock(plugins);
75-
logger.info("begin to sleep for " + coordinatorTimeout.getMillis() + " ms");
7675
Thread.sleep(coordinatorTimeout.getMillis() + 100);
77-
logger.info("wake up");
7876
disableBlocks(plugins);
7977
SearchResponse searchResponse = searchResponseFuture.get();
8078
assertEquals(1, searchResponse.getSuccessfulShards());

server/src/internalClusterTest/java/org/opensearch/search/basic/SearchWithRandomExceptionsIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void testRandomExceptions() throws IOException, InterruptedException, Exe
190190
}
191191

192192
} catch (SearchPhaseExecutionException ex) {
193-
logger.info("expected SearchPhaseException: [{}]", ex.getMessage());
193+
logger.info("expected SearchPhaseException: [{}]", ex);
194194
}
195195
}
196196

server/src/main/java/org/opensearch/action/search/SearchRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public SearchRequest(StreamInput in) throws IOException {
279279
if (in.getVersion().onOrAfter(Version.V_2_12_0)) {
280280
phaseTook = in.readOptionalBoolean();
281281
}
282-
if (in.getVersion().onOrAfter(Version.V_2_19_0)) {
282+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {// TODO: Change if/when we backport to 2.x
283283
coordinatorTimeout = in.readOptionalTimeValue();
284284
}
285285
}
@@ -316,7 +316,7 @@ public void writeTo(StreamOutput out) throws IOException {
316316
if (out.getVersion().onOrAfter(Version.V_2_12_0)) {
317317
out.writeOptionalBoolean(phaseTook);
318318
}
319-
if (out.getVersion().onOrAfter(Version.V_2_19_0)) {
319+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {// TODO: Change if/when we backport to 2.x
320320
out.writeOptionalTimeValue(coordinatorTimeout);
321321
}
322322
}

test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class MockBigArrays extends BigArrays {
6464
* Tracking allocations is useful when debugging a leak but shouldn't be enabled by default as this would also be very costly
6565
* since it creates a new Exception every time a new array is created.
6666
*/
67-
private static final boolean TRACK_ALLOCATIONS = false;
67+
private static final boolean TRACK_ALLOCATIONS = true;
6868

6969
private static final ConcurrentMap<Object, Object> ACQUIRED_ARRAYS = new ConcurrentHashMap<>();
7070

0 commit comments

Comments
 (0)