PR cleanup.

Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 · Jun 20, 2023 · dbdcff7 · dbdcff7
1 parent 455ff46
commit dbdcff7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/index/IndexSettings.java b/server/src/main/java/org/opensearch/index/IndexSettings.java
@@ -919,7 +919,7 @@ private void setSearchSegmentOrderReversed(boolean reversed) {
 
     private void setSearchIdleAfter(TimeValue searchIdleAfter) {
         if (this.replicationType == ReplicationType.SEGMENT && this.getNumberOfReplicas() > 0) {
-            logger.warn("Search idle is disabled for indices with replicas using the Segment Replication strategy");
+            logger.warn("Search idle is not supported for indices with replicas using 'replication.type: SEGMENT");
         }
         this.searchIdleAfter = searchIdleAfter;
     }

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -4222,13 +4222,9 @@ public boolean scheduledRefresh() {
         boolean listenerNeedsRefresh = refreshListeners.refreshNeeded();
         if (isReadAllowed() && (listenerNeedsRefresh || getEngine().refreshNeeded())) {
             if (listenerNeedsRefresh == false // if we have a listener that is waiting for a refresh we need to force it
+                && isSearchIdleSupported()
                 && isSearchIdle()
                 && indexSettings.isExplicitRefresh() == false
-                // Indices with segrep enabled will never wait on a refresh and ignore shard idle unless there are no replicas. Primary
-                // shards push out new segments only
-                // after a refresh, so we don't want to wait for a search to trigger that cycle. Replicas will only refresh after receiving
-                // a new set of segments.
-                && (indexSettings.isSegRepEnabled() == false || indexSettings.getNumberOfReplicas() == 0)
                 && active.get()) { // it must be active otherwise we might not free up segment memory once the shard became inactive
                 // lets skip this refresh since we are search idle and
                 // don't necessarily need to refresh. the next searcher access will register a refreshListener and that will
@@ -4256,6 +4252,19 @@ public final boolean isSearchIdle() {
         return (threadPool.relativeTimeInMillis() - lastSearcherAccess.get()) >= indexSettings.getSearchIdleAfter().getMillis();
     }
 
+    /**
+     *
+     * Returns true if this shard supports search idle.
+     *
+     * Indices using Segment Replication will ignore search idle unless there are no replicas.
+     * Primary shards push out new segments only
+     * after a refresh, so we don't want to wait for a search to trigger that cycle. Replicas will only refresh after receiving
+     * a new set of segments.
+     */
+    private boolean isSearchIdleSupported() {
+        return indexSettings.isSegRepEnabled() == false || indexSettings.getNumberOfReplicas() == 0;
+    }
+
     /**
      * Returns the last timestamp the searcher was accessed. This is a relative timestamp in milliseconds.
      */