diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 9447b49d65b..1053cda42f8 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -30,6 +30,9 @@ Other Changes * SOLR-14271: Remove duplicate async id check meant for pre Solr 8 versions (Anshum Gupta) +* SOLR-14272: Remove autoReplicaFailoverBadNodeExpiration and autoReplicaFailoverWorkLoopDelay for 9.0 as it was + deprecated in 7.1 (Anshum Gupta) + ================== 8.5.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java index 3be075f5c50..af0b62c1bfd 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java +++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java @@ -387,10 +387,6 @@ public class SolrXmlConfig { case "zkClientTimeout": builder.setZkClientTimeout(parseInt(name, value)); break; - case "autoReplicaFailoverBadNodeExpiration": case "autoReplicaFailoverWorkLoopDelay": - //TODO remove this in Solr 8.0 - log.info("Configuration parameter " + name + " is ignored"); - break; case "autoReplicaFailoverWaitAfterExpiration": builder.setAutoReplicaFailoverWaitAfterExpiration(parseInt(name, value)); break; diff --git a/solr/core/src/test-files/solr/solr-jmxreporter.xml b/solr/core/src/test-files/solr/solr-jmxreporter.xml index 58c4d0c296a..825147fded1 100644 --- a/solr/core/src/test-files/solr/solr-jmxreporter.xml +++ b/solr/core/src/test-files/solr/solr-jmxreporter.xml @@ -33,8 +33,6 @@ ${distribUpdateConnTimeout:45000} ${distribUpdateSoTimeout:340000} ${autoReplicaFailoverWaitAfterExpiration:10000} - ${autoReplicaFailoverWorkLoopDelay:10000} - ${autoReplicaFailoverBadNodeExpiration:60000} ${createCollectionWaitTimeTillActive:30} diff --git a/solr/core/src/test-files/solr/solr-solrreporter.xml b/solr/core/src/test-files/solr/solr-solrreporter.xml index 21f8ac1833c..205e12d1e4a 100644 --- a/solr/core/src/test-files/solr/solr-solrreporter.xml +++ b/solr/core/src/test-files/solr/solr-solrreporter.xml @@ -33,8 +33,6 @@ ${distribUpdateConnTimeout:45000} ${distribUpdateSoTimeout:340000} ${autoReplicaFailoverWaitAfterExpiration:10000} - ${autoReplicaFailoverWorkLoopDelay:10000} - ${autoReplicaFailoverBadNodeExpiration:60000} diff --git a/solr/core/src/test-files/solr/solr-trackingshardhandler.xml b/solr/core/src/test-files/solr/solr-trackingshardhandler.xml index e18eb279504..975502524fc 100644 --- a/solr/core/src/test-files/solr/solr-trackingshardhandler.xml +++ b/solr/core/src/test-files/solr/solr-trackingshardhandler.xml @@ -34,8 +34,6 @@ ${distribUpdateConnTimeout:45000} ${distribUpdateSoTimeout:340000} ${autoReplicaFailoverWaitAfterExpiration:10000} - ${autoReplicaFailoverWorkLoopDelay:10000} - ${autoReplicaFailoverBadNodeExpiration:60000} ${distribUpdateConnTimeout:5000} ${distribUpdateSoTimeout:30000} ${autoReplicaFailoverWaitAfterExpiration:10000} - ${autoReplicaFailoverWorkLoopDelay:10000} - ${autoReplicaFailoverBadNodeExpiration:60000}