You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/14 17:01:57 UTC
[lucene-solr] 02/02: #150 - Update some default settings.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit f51acf5f0281433e53674d82fb11174eb7850dd9
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 14 12:01:39 2020 -0500
#150 - Update some default settings.
---
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java | 8 ++++----
.../src/java/org/apache/solr/update/DefaultSolrCoreState.java | 4 ++--
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 4989d25..01528c3 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -108,10 +108,10 @@ public class RecoveryStrategy implements Runnable, Closeable {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private volatile int waitForUpdatesWithStaleStatePauseMilliSeconds = Integer
- .getInteger("solr.cloud.wait-for-updates-with-stale-state-pause", 2500);
+ .getInteger("solr.cloud.wait-for-updates-with-stale-state-pause", 0);
private volatile int maxRetries = 500;
private volatile int startingRecoveryDelayMilliSeconds = Integer
- .getInteger("solr.cloud.starting-recovery-delay-milli-seconds", 2000);
+ .getInteger("solr.cloud.starting-recovery-delay-milli-seconds", 0);
public static interface RecoveryListener {
public void recovered();
@@ -935,8 +935,8 @@ public class RecoveryStrategy implements Runnable, Closeable {
}
int conflictWaitMs = zkController.getLeaderConflictResolveWait();
- // timeout after 5 seconds more than the max timeout (conflictWait + 3 seconds) on the server side
- int readTimeout = conflictWaitMs + Integer.parseInt(System.getProperty("prepRecoveryReadTimeoutExtraWait", "8000"));
+
+ int readTimeout = conflictWaitMs + Integer.parseInt(System.getProperty("prepRecoveryReadTimeoutExtraWait", "100"));
try (HttpSolrClient client = buildRecoverySolrClient(leaderBaseUrl)) {
client.setSoTimeout(readTimeout);
HttpUriRequestResponse mrr = client.httpUriRequest(prepCmd);
diff --git a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
index 9590445..79e253b 100644
--- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
@@ -58,9 +58,9 @@ public final class DefaultSolrCoreState extends SolrCoreState implements Recover
private final ReentrantLock recoveryLock = new ReentrantLock();
- private final ActionThrottle recoveryThrottle = new ActionThrottle("recovery", Integer.getInteger("solr.recoveryThrottle", 5000));
+ private final ActionThrottle recoveryThrottle = new ActionThrottle("recovery", Integer.getInteger("solr.recoveryThrottle", 100));
- private final ActionThrottle leaderThrottle = new ActionThrottle("leader", Integer.getInteger("solr.leaderThrottle", 3000));
+ private final ActionThrottle leaderThrottle = new ActionThrottle("leader", Integer.getInteger("solr.leaderThrottle", 100));
private final AtomicInteger recoveryWaiting = new AtomicInteger();
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 8f750ff..7d45bef 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -232,7 +232,7 @@ public class SolrTestCase extends LuceneTestCase {
System.setProperty("solr.indexfetcher.sotimeout", "15000");
System.setProperty("solr.indexfetch.so_timeout.default", "15000");
- System.setProperty("prepRecoveryReadTimeoutExtraWait", "0");
+ System.setProperty("prepRecoveryReadTimeoutExtraWait", "100");
System.setProperty("validateAfterInactivity", "-1");
System.setProperty("leaderVoteWait", "5000"); // this is also apparently controlling how long we wait for a leader on register nocommit
System.setProperty("leaderConflictResolveWait", "10000");