Apache Solr open-source search software
SOLR-15699: remove unused updateHandler/indexWriter/closeWaitsForMerges element (#350)
Christine Poerschke2e12ce45df34
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 915a3bf8dac..8576f90788e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -380,6 +380,8 @@ Other Changes* SOLR-15716: Remove deprecated SolrException.ignorePatterns and related code (hossman)+* SOLR-15699: Removal of the (unused since 5.0) "updateHandler/indexWriter/closeWaitsForMerges" solrconfig.xml element. (Christine Poerschke)+Bug Fixes---------------------* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order executiondiff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.javaindex cda9175e421..abda92a1293 100644--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java@@ -430,7 +430,6 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {getInt("updateHandler/autoCommit/maxDocs", -1),getInt("updateHandler/autoCommit/maxTime", -1),convertHeapOptionStyleConfigStringToBytes(get("updateHandler/autoCommit/maxSize", "")),- getBool("updateHandler/indexWriter/closeWaitsForMerges", true),getBool("updateHandler/autoCommit/openSearcher", true),getInt("updateHandler/autoSoftCommit/maxDocs", -1),getInt("updateHandler/autoSoftCommit/maxTime", -1),@@ -647,7 +646,6 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {public final int autoCommmitMaxDocs, autoCommmitMaxTime,autoSoftCommmitMaxDocs, autoSoftCommmitMaxTime;public final long autoCommitMaxSizeBytes;- public final boolean indexWriterCloseWaitsForMerges;public final boolean openSearcher; // is opening a new searcher part of hard autocommit?public final boolean commitWithinSoftCommit;@@ -656,13 +654,12 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {* @param autoCommmitMaxTime set -1 as default* @param autoCommitMaxSize set -1 as default*/- public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int autoCommmitMaxTime, long autoCommitMaxSize, boolean indexWriterCloseWaitsForMerges, boolean openSearcher,+ public UpdateHandlerInfo(String className, int autoCommmitMaxDocs, int autoCommmitMaxTime, long autoCommitMaxSize, boolean openSearcher,int autoSoftCommmitMaxDocs, int autoSoftCommmitMaxTime, boolean commitWithinSoftCommit) {this.className = className;this.autoCommmitMaxDocs = autoCommmitMaxDocs;this.autoCommmitMaxTime = autoCommmitMaxTime;this.autoCommitMaxSizeBytes = autoCommitMaxSize;- this.indexWriterCloseWaitsForMerges = indexWriterCloseWaitsForMerges;this.openSearcher = openSearcher;this.autoSoftCommmitMaxDocs = autoSoftCommmitMaxDocs;@@ -674,7 +671,6 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {@Overridepublic Map<String, Object> toMap(Map<String, Object> map) {- map.put("indexWriter", Map.of("closeWaitsForMerges", indexWriterCloseWaitsForMerges));map.put("commitWithin", Map.of("softCommit", commitWithinSoftCommit));map.put("autoCommit", Map.of("maxDocs", autoCommmitMaxDocs,diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.javaindex db8ecbf9343..acc7c67f091 100644--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java@@ -111,8 +111,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreStatethis.commitWithinSoftCommit = value;}- protected boolean indexWriterCloseWaitsForMerges;-private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());public DirectUpdateHandler2(SolrCore core) {@@ -132,7 +130,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreStatesoftCommitTracker = new CommitTracker("Soft", core, softCommitDocsUpperBound, softCommitTimeUpperBound, NO_FILE_SIZE_UPPER_BOUND_PLACEHOLDER, true, true);commitWithinSoftCommit = updateHandlerInfo.commitWithinSoftCommit;- indexWriterCloseWaitsForMerges = updateHandlerInfo.indexWriterCloseWaitsForMerges;ZkController zkController = core.getCoreContainer().getZkController();if (zkController != null && core.getCoreDescriptor().getCloudDescriptor().getReplicaType() == Replica.Type.TLOG) {@@ -158,7 +155,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreStatesoftCommitTracker = new CommitTracker("Soft", core, softCommitDocsUpperBound, softCommitTimeUpperBound, NO_FILE_SIZE_UPPER_BOUND_PLACEHOLDER, updateHandlerInfo.openSearcher, true);commitWithinSoftCommit = updateHandlerInfo.commitWithinSoftCommit;- indexWriterCloseWaitsForMerges = updateHandlerInfo.indexWriterCloseWaitsForMerges;UpdateLog existingLog = updateHandler.getUpdateLog();if (this.ulog != null && this.ulog == existingLog) {diff --git a/solr/core/src/resources/EditableSolrConfigAttributes.json b/solr/core/src/resources/EditableSolrConfigAttributes.jsonindex 03bb1b67d90..9b27caa1bec 100644--- a/solr/core/src/resources/EditableSolrConfigAttributes.json+++ b/solr/core/src/resources/EditableSolrConfigAttributes.json@@ -17,8 +17,7 @@"autoSoftCommit":{"maxDocs":20,"maxTime":20},- "commitWithin":{"softCommit":11},- "indexWriter":{"closeWaitsForMerges":11}},+ "commitWithin":{"softCommit":11}},"query":{"filterCache":{"class":0,diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.javaindex 04434bddfdc..7cbc09894ed 100644--- a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java+++ b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java@@ -32,7 +32,6 @@ public class TestConfigOverlay extends SolrTestCase {assertTrue(isEditableProp("updateHandler/autoSoftCommit/maxDocs", true, null));assertTrue(isEditableProp("updateHandler/autoSoftCommit/maxTime", true, null));assertTrue(isEditableProp("updateHandler/commitWithin/softCommit", true, null));- assertTrue(isEditableProp("updateHandler/indexWriter/closeWaitsForMerges", true, null));assertTrue(isEditableProp("updateHandler.autoCommit.maxDocs", false, null));assertTrue(isEditableProp("updateHandler.autoCommit.maxTime", false, null));@@ -40,7 +39,6 @@ public class TestConfigOverlay extends SolrTestCase {assertTrue(isEditableProp("updateHandler.autoSoftCommit.maxDocs", false, null));assertTrue(isEditableProp("updateHandler.autoSoftCommit.maxTime", false, null));assertTrue(isEditableProp("updateHandler.commitWithin.softCommit", false, null));- assertTrue(isEditableProp("updateHandler.indexWriter.closeWaitsForMerges", false, null));assertTrue(isEditableProp("query.useFilterForSortedQuery", false, null));assertTrue(isEditableProp("query.queryResultWindowSize", false, null));assertTrue(isEditableProp("query.queryResultMaxDocsCached", false, null));diff --git a/solr/solr-ref-guide/src/config-api.adoc b/solr/solr-ref-guide/src/config-api.adocindex d2410a51ab7..cf5e812c5db 100644--- a/solr/solr-ref-guide/src/config-api.adoc+++ b/solr/solr-ref-guide/src/config-api.adoc@@ -177,7 +177,6 @@ See <<commits-transaction-logs.adoc#,Commits and Transaction Logs>> for defaults* `updateHandler.autoSoftCommit.maxDocs`* `updateHandler.autoSoftCommit.maxTime`* `updateHandler.commitWithin.softCommit`-* `updateHandler.indexWriter.closeWaitsForMerges`*Query Settings*