Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Test failures addressed (#1014)

Noble Paul399e3261af67
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 51472976158..b66bf4483e4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -385,6 +385,7 @@ public class ZkController implements Closeable {
.withTimeout(clientTimeout, TimeUnit.MILLISECONDS)
.withConnTimeOut(zkClientConnectTimeout, TimeUnit.MILLISECONDS)
.withConnStrategy(strat)
+ .withReconnectListener(() -> onReconnect(descriptorsSupplier))
.withBeforeConnect(() -> beforeReconnect(descriptorsSupplier))
.withAclProvider(zkACLProvider)
.withClosedCheck(cc::isShutDown)
@@ -423,7 +424,7 @@ public class ZkController implements Closeable {
private void beforeReconnect(Supplier<List<CoreDescriptor>> descriptorsSupplier) {
try {
- this.overseer.close();
+ overseer.close();
} catch (Exception e) {
log.error("Error trying to stop any Overseer threads", e);
}
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index ae9d9e4d75f..ac355547229 100755
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -1962,7 +1962,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
Path confPath =
@@ -2038,7 +2038,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
String confName = cli.getOptionValue("confname");
@@ -2121,7 +2121,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
if (recurse == false && zkClient.getChildren(znode, null, true).size() != 0) {
throw new SolrServerException(
@@ -2187,7 +2187,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
@@ -2253,7 +2253,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
@@ -2317,7 +2317,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
String src = cli.getOptionValue("src");
@@ -2400,7 +2400,7 @@ public class SolrCLI implements CLIO {
try (SolrZkClient zkClient =
new SolrZkClient.Builder()
.withUrl(zkHost)
- .withTimeout(10000, TimeUnit.MILLISECONDS)
+ .withTimeout(30000, TimeUnit.MILLISECONDS)
.build()) {
echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...", cli);
String src = cli.getOptionValue("src");