[apache#2316] Move custom commit declaration into UpdateHandlerInfo

Also add tests for retrieving and selecting the commit interval

Author: tboeghk

solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java

@@ -77,16 +77,13 @@ public void startReplication(boolean switchTransactionLog) {
       }
 
       SolrConfig.UpdateHandlerInfo uinfo = core.getSolrConfig().getUpdateHandlerInfo();
-      String customPollInterval =
-          core.getSolrConfig().get("updateHandler").get("commitPollInterval").txt();
       String pollIntervalStr = "00:00:03";
-      String calculatedPollIntervalString = determinePollInterval(uinfo);
-
       if (System.getProperty("jetty.testMode") != null) {
         pollIntervalStr = "00:00:01";
-      } else if (customPollInterval != null) {
-        pollIntervalStr = customPollInterval;
-      } else if (calculatedPollIntervalString != null) {
+      }
+
+      String calculatedPollIntervalString = determinePollInterval(uinfo);
+      if (calculatedPollIntervalString != null) {
         pollIntervalStr = calculatedPollIntervalString;
       }
       log.info("Will start replication from leader with poll interval: {}", pollIntervalStr);
@@ -170,8 +167,12 @@ public static String determinePollInterval(SolrConfig.UpdateHandlerInfo uinfo) {
     int hardCommitMaxTime = uinfo.autoCommmitMaxTime;
     int softCommitMaxTime = uinfo.autoSoftCommmitMaxTime;
     boolean hardCommitNewSearcher = uinfo.openSearcher;
+    String customCommitPollInterval = uinfo.commitPollInterval;
     String pollIntervalStr = null;
-    if (hardCommitMaxTime != -1) {
+
+    if (customCommitPollInterval != null) {
+      pollIntervalStr = customCommitPollInterval;
+    } else if (hardCommitMaxTime != -1) {
       // configured hardCommit places a ceiling on the interval at which new segments will be
       // available to replicate
       if (softCommitMaxTime != -1

solr/core/src/java/org/apache/solr/core/SolrConfig.java

@@ -818,6 +818,7 @@ public static class UpdateHandlerInfo implements MapSerializable {
     public final boolean openSearcher; // is opening a new searcher part of hard autocommit?
     public final boolean commitWithinSoftCommit;
     public final boolean aggregateNodeLevelMetricsEnabled;
+    public final String commitPollInterval;
 
     /**
      * @param autoCommmitMaxDocs set -1 as default
@@ -832,7 +833,8 @@ public UpdateHandlerInfo(
         boolean openSearcher,
         int autoSoftCommmitMaxDocs,
         int autoSoftCommmitMaxTime,
-        boolean commitWithinSoftCommit) {
+        boolean commitWithinSoftCommit,
+        String commitPollInterval) {
       this.className = className;
       this.autoCommmitMaxDocs = autoCommmitMaxDocs;
       this.autoCommmitMaxTime = autoCommmitMaxTime;
@@ -844,6 +846,8 @@ public UpdateHandlerInfo(
 
       this.commitWithinSoftCommit = commitWithinSoftCommit;
       this.aggregateNodeLevelMetricsEnabled = false;
+
+      this.commitPollInterval = commitPollInterval;
     }
 
     public UpdateHandlerInfo(ConfigNode updateHandler) {
@@ -860,6 +864,7 @@ public UpdateHandlerInfo(ConfigNode updateHandler) {
           updateHandler.get("commitWithin").get("softCommit").boolVal(true);
       this.aggregateNodeLevelMetricsEnabled =
           updateHandler.boolAttr("aggregateNodeLevelMetricsEnabled", false);
+      this.commitPollInterval = updateHandler.get("commitPollInterval").txt();
     }
 
     @Override
@@ -874,6 +879,7 @@ public Map<String, Object> toMap(Map<String, Object> map) {
       map.put(
           "autoSoftCommit",
           Map.of("maxDocs", autoSoftCommmitMaxDocs, "maxTime", autoSoftCommmitMaxTime));
+      map.put("commitPollInterval", commitPollInterval);
       return map;
     }
   }

solr/core/src/test/org/apache/solr/cloud/ReplicateFromLeaderTest.java

@@ -28,44 +28,64 @@ public class ReplicateFromLeaderTest {
   public void determinePollIntervalString() {
     SolrConfig.UpdateHandlerInfo updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, 15000, -1, true, -1, 60000, false);
+            "solr.DirectUpdateHandler2", -1, 15000, -1, true, -1, 60000, false, null);
     String pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:7", pollInterval);
 
     updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, 60000, -1, true, -1, 15000, false);
+            "solr.DirectUpdateHandler2", -1, 60000, -1, true, -1, 15000, false, null);
     pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:30", pollInterval);
 
     updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, 15000, -1, false, -1, 60000, false);
+            "solr.DirectUpdateHandler2", -1, 15000, -1, false, -1, 60000, false, null);
     pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:30", pollInterval);
 
     updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, 60000, -1, false, -1, 15000, false);
+            "solr.DirectUpdateHandler2", -1, 60000, -1, false, -1, 15000, false, null);
     pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:30", pollInterval);
 
     updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, -1, -1, false, -1, 60000, false);
+            "solr.DirectUpdateHandler2", -1, -1, -1, false, -1, 60000, false, null);
     pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:30", pollInterval);
 
     updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, 15000, -1, false, -1, -1, false);
+            "solr.DirectUpdateHandler2", -1, 15000, -1, false, -1, -1, false, null);
     pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:7", pollInterval);
 
     updateHandlerInfo =
         new SolrConfig.UpdateHandlerInfo(
-            "solr.DirectUpdateHandler2", -1, 60000, -1, true, -1, -1, false);
+            "solr.DirectUpdateHandler2", -1, 60000, -1, true, -1, -1, false, null);
     pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
     assertEquals("0:0:30", pollInterval);
+
+    updateHandlerInfo =
+        new SolrConfig.UpdateHandlerInfo(
+            "solr.DirectUpdateHandler2", -1, 60000, -1, true, -1, -1, false, "0:0:56");
+    pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
+    assertEquals("0:0:56", pollInterval);
+
+    updateHandlerInfo =
+        new SolrConfig.UpdateHandlerInfo(
+            "solr.DirectUpdateHandler2",
+            -1,
+            60000,
+            -1,
+            true,
+            -1,
+            -1,
+            false,
+            "garbage-unfortunately");
+    pollInterval = ReplicateFromLeader.determinePollInterval(updateHandlerInfo);
+    assertEquals("garbage-unfortunately", pollInterval);
   }
 }