Skip to content

Commit 82aa086

Browse files
author
Ajay Kumar Movva
committed
Removed testDeleteAllPitReaderContexts test
Signed-off-by: Ajay Kumar Movva <[email protected]>
1 parent 8a2afca commit 82aa086

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

server/src/main/java/org/opensearch/index/search/stats/SearchStats.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
package org.opensearch.index.search.stats;
3434

35+
import org.opensearch.Version;
3536
import org.opensearch.common.Nullable;
3637
import org.opensearch.common.Strings;
3738
import org.opensearch.common.io.stream.StreamInput;
@@ -140,9 +141,11 @@ private Stats(StreamInput in) throws IOException {
140141
suggestTimeInMillis = in.readVLong();
141142
suggestCurrent = in.readVLong();
142143

143-
pitCount = in.readVLong();
144-
pitTimeInMillis = in.readVLong();
145-
pitCurrent = in.readVLong();
144+
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
145+
pitCount = in.readVLong();
146+
pitTimeInMillis = in.readVLong();
147+
pitCurrent = in.readVLong();
148+
}
146149
}
147150

148151
public void add(Stats stats) {
@@ -289,9 +292,11 @@ public void writeTo(StreamOutput out) throws IOException {
289292
out.writeVLong(suggestTimeInMillis);
290293
out.writeVLong(suggestCurrent);
291294

292-
out.writeVLong(pitCount);
293-
out.writeVLong(pitTimeInMillis);
294-
out.writeVLong(pitCurrent);
295+
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
296+
out.writeVLong(pitCount);
297+
out.writeVLong(pitTimeInMillis);
298+
out.writeVLong(pitCurrent);
299+
}
295300
}
296301

297302
@Override

server/src/test/java/org/opensearch/search/PitMultiNodeTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ public void validatePitStats(String index, long expectedPitCurrent, long expecte
344344
assertEquals(expectedPitCurrent, pitCurrent);
345345
assertEquals(expectedOpenContexts, openContexts);
346346
}
347+
347348
public void testGetAllPits() throws Exception {
348349
client().admin().indices().prepareCreate("index1").get();
349350
CreatePitRequest request = new CreatePitRequest(TimeValue.timeValueDays(1), true);

server/src/test/java/org/opensearch/search/SearchServiceTests.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,21 +1455,6 @@ public void testDeletePitReaderContext() throws ExecutionException, InterruptedE
14551455
validatePitStats("index", 0, 1, 0);
14561456
}
14571457

1458-
public void testDeleteAllPitReaderContexts() throws ExecutionException, InterruptedException {
1459-
createIndex("index");
1460-
SearchService searchService = getInstanceFromNode(SearchService.class);
1461-
PlainActionFuture<ShardSearchContextId> future = new PlainActionFuture<>();
1462-
searchService.createPitReaderContext(new ShardId(resolveIndex("index"), 0), TimeValue.timeValueMinutes(between(1, 10)), future);
1463-
future.actionGet();
1464-
searchService.createPitReaderContext(new ShardId(resolveIndex("index"), 0), TimeValue.timeValueMinutes(between(1, 10)), future);
1465-
future.actionGet();
1466-
assertThat(searchService.getActiveContexts(), equalTo(2));
1467-
validatePitStats("index", 2, 0, 0);
1468-
searchService.freeAllPitContexts();
1469-
assertThat(searchService.getActiveContexts(), equalTo(0));
1470-
validatePitStats("index", 0, 2, 0);
1471-
}
1472-
14731458
public void testPitContextMaxKeepAlive() {
14741459
createIndex("index");
14751460
SearchService searchService = getInstanceFromNode(SearchService.class);

0 commit comments

Comments
 (0)