Added PR link to CHANGELOG, added tracker safety check in hasWarmNodes logic

Signed-off-by: Harsh Kothari <[email protected]>

Author: Harsh Kothari

CHANGELOG.md

@@ -46,7 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix the visit of sub queries for HasParentQuery and HasChildQuery ([#18621](https://github.com/opensearch-project/OpenSearch/pull/18621))
 - Fix the backward compatibility regression with COMPLEMENT for Regexp queries introduced in OpenSearch 3.0 ([#18640](https://github.com/opensearch-project/OpenSearch/pull/18640))
 - Fix Replication lag computation ([#18602](https://github.com/opensearch-project/OpenSearch/pull/18602))
-- Fixed Staggered merge -  load average replace with AverageTrackers, some Default thresholds modified
+- Fixed Staggered merge -  load average replace with AverageTrackers, some Default thresholds modified ([#18666](https://github.com/opensearch-project/OpenSearch/pull/18666))
 
 ### Security
 

server/src/main/java/org/opensearch/index/autoforcemerge/AutoForceMergeManager.java

@@ -127,6 +127,7 @@ private void triggerForceMerge() {
 
     private boolean isValidForForceMerge() {
         if (configurationValidator.hasWarmNodes() == false) {
+            resourceTrackers.stop();
             logger.debug("No warm nodes found. Skipping Auto Force merge.");
             return false;
         }

server/src/main/java/org/opensearch/index/autoforcemerge/ResourceTrackerProvider.java

@@ -20,8 +20,8 @@
  */
 public class ResourceTrackerProvider {
 
-    public static final TimeValue AVERAGE_WINDOW_ONE_SECOND = TimeValue.timeValueSeconds(1);
-    public static final TimeValue AVERAGE_WINDOW_FIVE_SECOND = TimeValue.timeValueSeconds(5);
+    public static final TimeValue AVERAGE_WINDOW_ONE_SECOND = TimeValue.timeValueSeconds(6);
+    public static final TimeValue AVERAGE_WINDOW_FIVE_SECOND = TimeValue.timeValueSeconds(30);
     public static final TimeValue AVERAGE_WINDOW_ONE_MINUTE = TimeValue.timeValueMinutes(1);
     public static final TimeValue AVERAGE_WINDOW_FIVE_MINUTE = TimeValue.timeValueMinutes(5);
 

server/src/test/java/org/opensearch/index/autoforcemerge/AutoForceMergeManagerTests.java

@@ -237,10 +237,10 @@ public void testNodeValidatorWithHighCPU() {
         autoForceMergeManager.start();
         when(cpu.getPercent()).thenReturn((short) 95);
         assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
-        for (int i = 0; i < 60; i++)
+        for (int i = 0; i < 10; i++)
             ResourceTrackerProvider.resourceTrackers.cpuOneMinute.recordUsage(90);
         assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
-        for (int i = 0; i < 60; i++)
+        for (int i = 0; i < 10; i++)
             ResourceTrackerProvider.resourceTrackers.cpuFiveMinute.recordUsage(90);
         assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
         autoForceMergeManager.close();
@@ -261,10 +261,10 @@ public void testNodeValidatorWithHighJVMUsage() {
         autoForceMergeManager.start();
         when(jvm.getHeapUsedPercent()).thenReturn((short) 90);
         assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
-        for(int i = 0; i < 60; i++)
+        for(int i = 0; i < 10; i++)
             ResourceTrackerProvider.resourceTrackers.jvmOneMinute.recordUsage(90);
         assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
-        for(int i = 0; i < 60; i++)
+        for(int i = 0; i < 10; i++)
             ResourceTrackerProvider.resourceTrackers.jvmFiveMinute.recordUsage(90);
         assertFalse(autoForceMergeManager.getNodeValidator().validate().isAllowed());
         autoForceMergeManager.close();