From f225b4dfd71387e5e7355ef1c72e1edfe4b1e4d1 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 08:22:00 -0400
Subject: [PATCH] Don't rely on test code execution time span for
 RemoteSegmentTransferTrackerTests (#15187) (#15244)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ef1a79fdc7159852a6fc13e61625fa6e661fc6d1)

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../remote/RemoteSegmentTransferTracker.java      |  4 ++--
 .../remote/RemoteSegmentTransferTrackerTests.java | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java b/server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java
index f1843ea3eef38..a29bd1d840b43 100644
--- a/server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java
+++ b/server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java
@@ -65,7 +65,7 @@ public class RemoteSegmentTransferTracker extends RemoteTransferTracker {
     private volatile long remoteRefreshSeqNo;
 
     /**
-     * The refresh time of most recent remote refresh.
+     * The refresh time of the most recent remote refresh.
      */
     private volatile long remoteRefreshTimeMs;
 
@@ -76,7 +76,7 @@ public class RemoteSegmentTransferTracker extends RemoteTransferTracker {
     private volatile long remoteRefreshStartTimeMs = -1;
 
     /**
-     * The refresh time(clock) of most recent remote refresh.
+     * The refresh time(clock) of the most recent remote refresh.
      */
     private volatile long remoteRefreshClockTimeMs;
 
diff --git a/server/src/test/java/org/opensearch/index/remote/RemoteSegmentTransferTrackerTests.java b/server/src/test/java/org/opensearch/index/remote/RemoteSegmentTransferTrackerTests.java
index 1ec1e9977a9d5..f4101cb054687 100644
--- a/server/src/test/java/org/opensearch/index/remote/RemoteSegmentTransferTrackerTests.java
+++ b/server/src/test/java/org/opensearch/index/remote/RemoteSegmentTransferTrackerTests.java
@@ -152,15 +152,18 @@ public void testComputeTimeLagOnUpdate() throws InterruptedException {
         transferTracker.updateLocalRefreshTimeMs(currentTimeMsUsingSystemNanos());
 
         transferTracker.updateLatestLocalFileNameLengthMap(List.of("test"), k -> 1L);
-        // Sleep for 100ms and then the lag should be within 100ms +/- 20ms
-        Thread.sleep(100);
-        assertTrue(Math.abs(transferTracker.getTimeMsLag() - 100) <= 20);
+        // Sleep for 100ms and then the lag should not be shorter
+        long span = 100;
+        Thread.sleep(span);
+        long lag = transferTracker.getTimeMsLag();
+        assertTrue("Actual lag [" + lag + "ms] is not expected to be shorter than span [" + span + "ms]", lag >= span);
 
         transferTracker.updateRemoteRefreshTimeMs(transferTracker.getLocalRefreshTimeMs());
         transferTracker.updateLocalRefreshTimeMs(currentTimeMsUsingSystemNanos());
-        long random = randomIntBetween(50, 200);
-        Thread.sleep(random);
-        assertTrue(Math.abs(transferTracker.getTimeMsLag() - random) <= 20);
+        long randomSpan = randomIntBetween(50, 200);
+        Thread.sleep(randomSpan);
+        lag = transferTracker.getTimeMsLag();
+        assertTrue("Actual lag [" + lag + "ms] is not expected to be shorter than span [" + randomSpan + "ms]", lag >= randomSpan);
     }
 
     public void testAddUploadBytesStarted() {