Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SOLR-17577: Remove dead system property #2888

Merged
merged 3 commits into from
Dec 2, 2024
+3 −15
Merged

SOLR-17577: Remove dead system property #2888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7432f8
Remove dead system property
epugh Nov 27, 2024
06f6e0c
Merge remote-tracking branch 'upstream/main' into SOLR-17577
epugh Dec 2, 2024
843144b
Track change
epugh Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------
Expand Down
7 changes: 1 addition & 6 deletions solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,13 +304,8 @@ public 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 =
Expand Down
3 changes: 0 additions & 3 deletions solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ public void setUp() throws Exception {
buildUrl(followerJetty.getLocalPort()), DEFAULT_TEST_CORENAME);
followerClientHealthCheck =
ReplicationTestHelper.createNewSolrClient(buildUrl(followerJetty.getLocalPort()));

System.setProperty("solr.indexfetcher.sotimeout2", "45000");
}

public void clearIndexWithReplication() throws Exception {
Expand Down Expand Up @@ -116,7 +114,6 @@ public void tearDown() throws Exception {
followerClientHealthCheck.close();
followerClientHealthCheck = null;
}
System.clearProperty("solr.indexfetcher.sotimeout");
}

@Test
Expand Down
3 changes: 0 additions & 3 deletions solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ public void setUp() throws Exception {
followerClient =
ReplicationTestHelper.createNewSolrClient(
buildUrl(followerJetty.getLocalPort()), DEFAULT_TEST_CORENAME);

System.setProperty("solr.indexfetcher.sotimeout2", "45000");
}

public void clearIndexWithReplication() throws Exception {
Expand Down Expand Up @@ -168,7 +166,6 @@ public void tearDown() throws Exception {
followerClient.close();
followerClient = null;
}
System.clearProperty("solr.indexfetcher.sotimeout");
}

static JettySolrRunner createAndStartJetty(SolrInstance instance) throws Exception {
Expand Down
3 changes: 0 additions & 3 deletions solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ public void setUp() throws Exception {
followerClient =
ReplicationTestHelper.createNewSolrClient(
TestReplicationHandler.buildUrl(followerJetty.getLocalPort()), DEFAULT_TEST_CORENAME);

System.setProperty("solr.indexfetcher.sotimeout2", "45000");
}

@Override
Expand All @@ -118,7 +116,6 @@ public void tearDown() throws Exception {
followerClient = null;
}
System.clearProperty(TEST_URL_ALLOW_LIST);
System.clearProperty("solr.indexfetcher.sotimeout");

IndexFetcher.usableDiskSpaceProvider = originalDiskSpaceprovider;
IndexFetcher.testWait = originalTestWait;
Expand Down
Loading