Apache Solr open-source search software
SOLR-17577: Remove dead system property (#2888)
Eric Pugh5f888e548ad7
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex e32f1f1ac4f..f9b434018ed 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -258,6 +258,8 @@ led to the suppression of exceptions. (Andrey Bozhko)* SOLR-17556: "home" and "data" directories used by Solr examples have been updated to align with documented best practices. (Eric Pugh, Houston Putman)+* SOLR-17577: Remove "solr.indexfetcher.sotimeout" system property that was for optimizing replication tests. It was disabled, but not removed. (Eric Pugh)+================== 9.7.1 ==================Bug Fixes---------------------diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javaindex 95c4a1be611..50f845e1609 100644--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java@@ -304,13 +304,8 @@ public class IndexFetcher {useInternalCompression = ReplicationHandler.INTERNAL.equals(compress);useExternalCompression = ReplicationHandler.EXTERNAL.equals(compress);connTimeout = getParameter(initArgs, HttpClientUtil.PROP_CONNECTION_TIMEOUT, 30000, null);+ soTimeout = getParameter(initArgs, HttpClientUtil.PROP_SO_TIMEOUT, 120000, null);- // allow a leader override for tests - you specify this in /replication follower section of- // solrconfig and some test don't want to define this- soTimeout = Integer.getInteger("solr.indexfetcher.sotimeout", -1);- if (soTimeout == -1) {- soTimeout = getParameter(initArgs, HttpClientUtil.PROP_SO_TIMEOUT, 120000, null);- }String httpBasicAuthUser = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_USER);String httpBasicAuthPassword = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_PASS);solrClient =diff --git a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.javaindex b376e52bd9b..fe25a08da3c 100644--- a/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java+++ b/solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java@@ -74,8 +74,6 @@ public class TestHealthCheckHandlerLegacyMode extends SolrTestCaseJ4 {buildUrl(followerJetty.getLocalPort()), DEFAULT_TEST_CORENAME);followerClientHealthCheck =ReplicationTestHelper.createNewSolrClient(buildUrl(followerJetty.getLocalPort()));-- System.setProperty("solr.indexfetcher.sotimeout2", "45000");}public void clearIndexWithReplication() throws Exception {@@ -116,7 +114,6 @@ public class TestHealthCheckHandlerLegacyMode extends SolrTestCaseJ4 {followerClientHealthCheck.close();followerClientHealthCheck = null;}- System.clearProperty("solr.indexfetcher.sotimeout");}@Testdiff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex d1566b9c80d..14714b64c26 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -134,8 +134,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {followerClient =ReplicationTestHelper.createNewSolrClient(buildUrl(followerJetty.getLocalPort()), DEFAULT_TEST_CORENAME);-- System.setProperty("solr.indexfetcher.sotimeout2", "45000");}public void clearIndexWithReplication() throws Exception {@@ -168,7 +166,6 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {followerClient.close();followerClient = null;}- System.clearProperty("solr.indexfetcher.sotimeout");}static JettySolrRunner createAndStartJetty(SolrInstance instance) throws Exception {diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.javaindex 67b5cc47d9c..7bd54f68c77 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java@@ -92,8 +92,6 @@ public class TestReplicationHandlerDiskOverFlow extends SolrTestCaseJ4 {followerClient =ReplicationTestHelper.createNewSolrClient(TestReplicationHandler.buildUrl(followerJetty.getLocalPort()), DEFAULT_TEST_CORENAME);-- System.setProperty("solr.indexfetcher.sotimeout2", "45000");}@Override@@ -118,7 +116,6 @@ public class TestReplicationHandlerDiskOverFlow extends SolrTestCaseJ4 {followerClient = null;}System.clearProperty(TEST_URL_ALLOW_LIST);- System.clearProperty("solr.indexfetcher.sotimeout");IndexFetcher.usableDiskSpaceProvider = originalDiskSpaceprovider;IndexFetcher.testWait = originalTestWait;