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/11/09 04:08:06 UTC
[lucene-solr] 04/04: @1103 Change a leader retry check to be a bit
more hardened.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 800d957d3f0384c902bfc98555fc2964eb312af0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Nov 8 22:01:26 2020 -0600
@1103 Change a leader retry check to be a bit more hardened.
---
solr/core/src/java/org/apache/solr/cloud/LeaderElector.java | 12 ++++++++++++
.../src/java/org/apache/solr/SolrTestCase.java | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
index 9cb54a8..e6b89ae 100644
--- a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
+++ b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
@@ -329,6 +329,12 @@ public class LeaderElector implements Closeable {
boolean tryagain = checkIfIamLeader(context, replacement);
if (tryagain) {
+ Thread.sleep(100);
+ tryagain = checkIfIamLeader(context, replacement);
+ }
+
+ if (tryagain) {
+ Thread.sleep(100);
checkIfIamLeader(context, replacement);
}
@@ -376,6 +382,12 @@ public class LeaderElector implements Closeable {
// am I the next leader?
boolean tryagain = checkIfIamLeader(context, true);
if (tryagain) {
+ Thread.sleep(100);
+ tryagain = checkIfIamLeader(context, true);
+ }
+
+ if (tryagain) {
+ Thread.sleep(100);
checkIfIamLeader(context, true);
}
} catch (AlreadyClosedException | InterruptedException e) {
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 d3b5035..137b66d 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -180,7 +180,7 @@ public class SolrTestCase extends LuceneTestCase {
}
- public static final int DEFAULT_ZK_SESSION_TIMEOUT = 20000; // default socket connection timeout in ms
+ public static final int DEFAULT_ZK_SESSION_TIMEOUT = 30000; // default socket connection timeout in ms
public static final int DEFAULT_CONNECTION_TIMEOUT = 10000; // default socket connection timeout in ms
public static final int DEFAULT_SOCKET_TIMEOUT_MILLIS = 15000;