Skip to content

Commit 75b86b9

Browse files
mch2Bukhtawar
authored andcommitted
Fix random gradle check failure issue 3584. (#3627)
1 parent bc3dffb commit 75b86b9

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

server/src/test/java/org/opensearch/index/engine/NRTReplicationEngineTests.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ public void testUpdateSegments() throws Exception {
110110

111111
engine.refresh("test");
112112

113-
nrtEngine.updateSegments(engine.getLatestSegmentInfos(), engine.getProcessedLocalCheckpoint());
114-
assertMatchingSegmentsAndCheckpoints(nrtEngine);
113+
final SegmentInfos latestPrimaryInfos = engine.getLatestSegmentInfos();
114+
nrtEngine.updateSegments(latestPrimaryInfos, engine.getProcessedLocalCheckpoint());
115+
assertMatchingSegmentsAndCheckpoints(nrtEngine, latestPrimaryInfos);
115116

116117
// assert a doc from the operations exists.
117118
final ParsedDocument parsedDoc = createParsedDoc(operations.stream().findFirst().get().id(), null);
@@ -139,8 +140,9 @@ public void testUpdateSegments() throws Exception {
139140
);
140141
}
141142

142-
nrtEngine.updateSegments(engine.getLastCommittedSegmentInfos(), engine.getProcessedLocalCheckpoint());
143-
assertMatchingSegmentsAndCheckpoints(nrtEngine);
143+
final SegmentInfos primaryInfos = engine.getLastCommittedSegmentInfos();
144+
nrtEngine.updateSegments(primaryInfos, engine.getProcessedLocalCheckpoint());
145+
assertMatchingSegmentsAndCheckpoints(nrtEngine, primaryInfos);
144146

145147
assertEquals(
146148
nrtEngine.getTranslog().getGeneration().translogFileGeneration,
@@ -196,14 +198,14 @@ public void testTrimTranslogOps() throws Exception {
196198
}
197199
}
198200

199-
private void assertMatchingSegmentsAndCheckpoints(NRTReplicationEngine nrtEngine) throws IOException {
201+
private void assertMatchingSegmentsAndCheckpoints(NRTReplicationEngine nrtEngine, SegmentInfos expectedSegmentInfos)
202+
throws IOException {
200203
assertEquals(engine.getPersistedLocalCheckpoint(), nrtEngine.getPersistedLocalCheckpoint());
201204
assertEquals(engine.getProcessedLocalCheckpoint(), nrtEngine.getProcessedLocalCheckpoint());
202205
assertEquals(engine.getLocalCheckpointTracker().getMaxSeqNo(), nrtEngine.getLocalCheckpointTracker().getMaxSeqNo());
203-
assertEquals(engine.getLatestSegmentInfos().files(true), nrtEngine.getLatestSegmentInfos().files(true));
204-
assertEquals(engine.getLatestSegmentInfos().getUserData(), nrtEngine.getLatestSegmentInfos().getUserData());
205-
assertEquals(engine.getLatestSegmentInfos().getVersion(), nrtEngine.getLatestSegmentInfos().getVersion());
206-
assertEquals(engine.segments(true), nrtEngine.segments(true));
206+
assertEquals(expectedSegmentInfos.files(true), nrtEngine.getLatestSegmentInfos().files(true));
207+
assertEquals(expectedSegmentInfos.getUserData(), nrtEngine.getLatestSegmentInfos().getUserData());
208+
assertEquals(expectedSegmentInfos.getVersion(), nrtEngine.getLatestSegmentInfos().getVersion());
207209
}
208210

209211
private void assertSearcherHits(Engine engine, int hits) {

0 commit comments

Comments
 (0)