Skip to content

Commit ef1a79f

Browse files
authored
Don't rely on test code execution time span for RemoteSegmentTransferTrackerTests (#15187)
Signed-off-by: Lukáš Vlček <[email protected]>
1 parent 68bdb77 commit ef1a79f

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class RemoteSegmentTransferTracker extends RemoteTransferTracker {
6565
private volatile long remoteRefreshSeqNo;
6666

6767
/**
68-
* The refresh time of most recent remote refresh.
68+
* The refresh time of the most recent remote refresh.
6969
*/
7070
private volatile long remoteRefreshTimeMs;
7171

@@ -76,7 +76,7 @@ public class RemoteSegmentTransferTracker extends RemoteTransferTracker {
7676
private volatile long remoteRefreshStartTimeMs = -1;
7777

7878
/**
79-
* The refresh time(clock) of most recent remote refresh.
79+
* The refresh time(clock) of the most recent remote refresh.
8080
*/
8181
private volatile long remoteRefreshClockTimeMs;
8282

server/src/test/java/org/opensearch/index/remote/RemoteSegmentTransferTrackerTests.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,18 @@ public void testComputeTimeLagOnUpdate() throws InterruptedException {
152152
transferTracker.updateLocalRefreshTimeMs(currentTimeMsUsingSystemNanos());
153153

154154
transferTracker.updateLatestLocalFileNameLengthMap(List.of("test"), k -> 1L);
155-
// Sleep for 100ms and then the lag should be within 100ms +/- 20ms
156-
Thread.sleep(100);
157-
assertTrue(Math.abs(transferTracker.getTimeMsLag() - 100) <= 20);
155+
// Sleep for 100ms and then the lag should not be shorter
156+
long span = 100;
157+
Thread.sleep(span);
158+
long lag = transferTracker.getTimeMsLag();
159+
assertTrue("Actual lag [" + lag + "ms] is not expected to be shorter than span [" + span + "ms]", lag >= span);
158160

159161
transferTracker.updateRemoteRefreshTimeMs(transferTracker.getLocalRefreshTimeMs());
160162
transferTracker.updateLocalRefreshTimeMs(currentTimeMsUsingSystemNanos());
161-
long random = randomIntBetween(50, 200);
162-
Thread.sleep(random);
163-
assertTrue(Math.abs(transferTracker.getTimeMsLag() - random) <= 20);
163+
long randomSpan = randomIntBetween(50, 200);
164+
Thread.sleep(randomSpan);
165+
lag = transferTracker.getTimeMsLag();
166+
assertTrue("Actual lag [" + lag + "ms] is not expected to be shorter than span [" + randomSpan + "ms]", lag >= randomSpan);
164167
}
165168

166169
public void testAddUploadBytesStarted() {

0 commit comments

Comments
 (0)