Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix flakyness in RemoteStoreRefreshListenerTests #8550

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Fix flakyness in RemoteStoreRefreshListenerTests #8550

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfb5514
Fix flakyness in RemoteStoreRefreshListenerTests
ashking94 Jul 9, 2023
43cc42f
Fix flakyness in RemoteStoreRefreshListenerTests
ashking94 Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.collect.Tuple;
import org.opensearch.common.concurrent.GatedCloseable;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.lease.Releasable;
import org.opensearch.index.engine.InternalEngineFactory;
import org.opensearch.index.remote.RemoteRefreshSegmentPressureService;
import org.opensearch.index.remote.RemoteRefreshSegmentTracker;
Expand Down Expand Up @@ -249,10 +249,7 @@ public void testRefreshSuccessOnFirstAttempt() throws Exception {
assertBusy(() -> assertEquals(0, successLatch.getCount()));
RemoteRefreshSegmentPressureService pressureService = tuple.v2();
RemoteRefreshSegmentTracker segmentTracker = pressureService.getRemoteRefreshSegmentTracker(indexShard.shardId());
assertEquals(0, segmentTracker.getBytesLag());
assertEquals(0, segmentTracker.getRefreshSeqNoLag());
assertEquals(0, segmentTracker.getTimeMsLag());
assertEquals(0, segmentTracker.getTotalUploadsFailed());
assertNoLagAndTotalUploadsFailed(segmentTracker, 0);
}

public void testRefreshSuccessOnSecondAttempt() throws Exception {
Expand All @@ -273,10 +270,7 @@ public void testRefreshSuccessOnSecondAttempt() throws Exception {
assertBusy(() -> assertEquals(0, successLatch.getCount()));
RemoteRefreshSegmentPressureService pressureService = tuple.v2();
RemoteRefreshSegmentTracker segmentTracker = pressureService.getRemoteRefreshSegmentTracker(indexShard.shardId());
assertEquals(0, segmentTracker.getBytesLag());
assertEquals(0, segmentTracker.getRefreshSeqNoLag());
assertEquals(0, segmentTracker.getTimeMsLag());
assertEquals(1, segmentTracker.getTotalUploadsFailed());
assertNoLagAndTotalUploadsFailed(segmentTracker, 1);
}

/**
Expand Down Expand Up @@ -304,7 +298,7 @@ public void testRefreshSuccessAfterFailureInFirstAttemptAfterSnapshotAndMetadata
assertBusy(() -> assertEquals(0, reachedCheckpointPublishLatch.getCount()));
}

public void testRefreshSuccessOnThirdAttemptAttempt() throws Exception {
public void testRefreshSuccessOnThirdAttempt() throws Exception {
// This covers 3 cases - 1) isRetry=false, shouldRetry=true 2) isRetry=true, shouldRetry=false 3) isRetry=True, shouldRetry=true
// Succeed on 3rd attempt
int succeedOnAttempt = 3;
Expand All @@ -322,11 +316,16 @@ public void testRefreshSuccessOnThirdAttemptAttempt() throws Exception {
assertBusy(() -> assertEquals(0, successLatch.getCount()));
RemoteRefreshSegmentPressureService pressureService = tuple.v2();
RemoteRefreshSegmentTracker segmentTracker = pressureService.getRemoteRefreshSegmentTracker(indexShard.shardId());
assertEquals(0, segmentTracker.getBytesLag());
assertEquals(0, segmentTracker.getRefreshSeqNoLag());
assertEquals(0, segmentTracker.getTimeMsLag());
assertEquals(2, segmentTracker.getTotalUploadsFailed());
assertNoLagAndTotalUploadsFailed(segmentTracker, 2);
}

private void assertNoLagAndTotalUploadsFailed(RemoteRefreshSegmentTracker segmentTracker, long totalUploadsFailed) throws Exception {
assertBusy(() -> {
sachinpkale marked this conversation as resolved.
Show resolved Hide resolved
assertEquals(0, segmentTracker.getBytesLag());
assertEquals(0, segmentTracker.getRefreshSeqNoLag());
assertEquals(0, segmentTracker.getTimeMsLag());
assertEquals(totalUploadsFailed, segmentTracker.getTotalUploadsFailed());
});
}

public void testTrackerData() throws Exception {
Expand Down