You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/03/26 16:46:09 UTC
[lucene] tag history/branches/lucene-solr/reference_impl created
(now 3fb35b9)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git.
at 3fb35b9 (commit)
This tag includes the following new commits:
new cf45866 @1437 State publish cache back in.
new 8876bf7 @1438 Small tweaks for mocky tests.
new edbf817 @1439 Logging cleanup and zkstatewriter use the latest replica stats exception state.
new 15c0f97 @1440 Debug logging.
new f2dcb3f @1441 Log it for the load tests, don't kill it.
new 2113132 @1442 Raise timeout to be more reasonable.
new 3fb35b9 wip - workaround, create old clusterstate.json.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[lucene] 03/07: @1439 Logging cleanup and zkstatewriter use the
latest replica stats exception state.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit edbf8172a2337b57b4e2a5e389a0cf9fbe2a6e3b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 19:54:47 2021 -0600
@1439 Logging cleanup and zkstatewriter use the latest replica stats exception state.
Took 19 minutes
---
.../solr/cloud/api/collections/DeleteCollectionCmd.java | 2 +-
.../java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 14 +++++++-------
.../java/org/apache/solr/update/SolrCmdDistributor.java | 12 ++++++------
.../client/solrj/impl/SolrClientNodeStateProvider.java | 3 +--
.../solrj/src/java/org/apache/solr/common/cloud/Slice.java | 9 +++++++--
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
index c55b879..12661f9 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
@@ -107,7 +107,7 @@ public class DeleteCollectionCmd implements OverseerCollectionMessageHandler.Cmd
zkStateReader.getZkClient().getSolrZooKeeper().sync(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection, (rc, path, ctx) -> {
latch.countDown();
}, null);
- latch.await(5, TimeUnit.SECONDS);
+ latch.await(10, TimeUnit.SECONDS);
if (!zkStateReader.getZkClient().exists(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection)) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Could not find collection " + collection);
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 06675de..9f91b41 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -120,11 +120,11 @@ public class ZkStateWriter {
idToCollection.put(collection.getId(), collection.getName());
- if (currentCollection != null) {
- if (currentCollection.getId() != collection.getId()) {
- removeCollection(collection.getName());
- }
- }
+// if (currentCollection != null) {
+// if (currentCollection.getId() != collection.getId()) {
+// removeCollection(collection.getName());
+// }
+// }
if (currentCollection != null) {
@@ -462,7 +462,7 @@ public class ZkStateWriter {
//log.info("writing out state, looking at collections count={} toWrite={} {} : {}", cs.getCollectionsMap().size(), collectionsToWrite.size(), cs.getCollectionsMap().keySet(), collectionsToWrite);
//try {
cs.forEachCollection(collection -> {
- log.info("check collection {} {} {}", collection, dirtyStructure, dirtyState);
+ if (log.isDebugEnabled()) log.debug("check collection {} {} {}", collection, dirtyStructure, dirtyState);
Integer version = null;
if (dirtyStructure.contains(collection.getName()) || dirtyState.contains(collection.getName())) {
log.info("process collection {}", collection);
@@ -549,7 +549,7 @@ public class ZkStateWriter {
});
- removeCollections.forEach(c -> removeCollection(c));
+ //removeCollections.forEach(c -> removeCollection(c));
if (badVersionException.get() != null) {
throw badVersionException.get();
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index f9f74a5..a1c8249 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -246,14 +246,14 @@ public class SolrCmdDistributor implements Closeable {
// if (log.isDebugEnabled()) {
// log.debug("sending update to " + req.node.getUrl() + " retry:" + req.retries + " " + req.cmd + " params:" + req.uReq.getParams());
// }
- if (req.cmd instanceof AddUpdateCommand) {
- log.info("sending update to " + req.node.getUrl() + " retry:" + req.retries + " docid=" + ((AddUpdateCommand) req.cmd).getPrintableId() + " " + req.cmd + " params:" + req.uReq.getParams());
- } else {
- log.info("sending update to " + req.node.getUrl() + " retry:" + req.retries + " docid=" + req.cmd + " params:" + req.uReq.getParams());
+ if (log.isDebugEnabled()) {
+ if (req.cmd instanceof AddUpdateCommand) {
+ log.info("sending update to " + req.node.getUrl() + " retry:" + req.retries + " docid=" + ((AddUpdateCommand) req.cmd).getPrintableId() + " " + req.cmd + " params:" + req.uReq.getParams());
+ } else {
+ log.info("sending update to " + req.node.getUrl() + " retry:" + req.retries + " docid=" + req.cmd + " params:" + req.uReq.getParams());
+ }
}
-
-
req.uReq.setBasePath(req.node.getUrl());
if (req.synchronous) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
index b982595..86c7995 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
@@ -299,8 +299,7 @@ public class SolrClientNodeStateProvider implements NodeStateProvider, MapWriter
if (n != null) ctx.getTags().put(HEAPUSAGE, n.doubleValue() * 100.0d);
}
} catch (Exception e) {
- ParWork.propagateInterrupt(e);
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error getting remote info", e);
+ log.error("Error getting remote info", e);
}
}
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
index 18c9d3b..50726bf 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
@@ -83,8 +83,13 @@ public class Slice extends ZkNodeProps implements Iterable<Replica> {
Replica currentReplica = currentSlice.getReplica(replica.getName());
if (currentReplica != null) {
-
- Replica newReplica = new Replica(replica.getName(), currentReplica.getProperties(), replica.collection, replica.collectionId, replica.slice,
+ replica.getProperties().put(ZkStateReader.STATE_PROP, currentReplica.getState().toString().toLowerCase(Locale.ROOT));
+ if (Boolean.parseBoolean((String) currentReplica.getProperties().get("leader"))) {
+ replica.propMap.put("leader", "true");
+ } else {
+ replica.propMap.remove("leader");
+ }
+ Replica newReplica = new Replica(replica.getName(), replica.getProperties(), replica.collection, replica.collectionId, replica.slice,
nodeNameToBaseUrl);
replicas.put(replica.getName(), newReplica);
} else {
[lucene] 07/07: wip - workaround, create old clusterstate.json.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 3fb35b9cbdc7877ef48a48d2e727f1fda465325c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 21:38:44 2021 -0600
wip - workaround, create old clusterstate.json.
Took 3 minutes
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 ++
1 file changed, 2 insertions(+)
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 2a78b18..2884dbb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -840,6 +840,8 @@ public class ZkController implements Closeable, Runnable {
paths.put(ZkStateReader.ROLES, emptyJson);
+ paths.put("/clusterstate.json", emptyJson);
+
paths.put(COLLECTIONS_ZKNODE, null);
//
[lucene] 01/07: @1437 State publish cache back in.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit cf458663a91a5432f1a2d13edb91603c93c97d6c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 17:26:18 2021 -0600
@1437 State publish cache back in.
Took 10 minutes
Took 3 minutes
---
.../java/org/apache/solr/cloud/StatePublisher.java | 28 ++++++++++--------
.../java/org/apache/solr/cloud/ZkController.java | 2 ++
.../apache/solr/cloud/overseer/ZkStateWriter.java | 33 ++++++----------------
.../processor/DistributedZkUpdateProcessor.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 1 +
5 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/StatePublisher.java b/solr/core/src/java/org/apache/solr/cloud/StatePublisher.java
index b332fc8..880045f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/StatePublisher.java
+++ b/solr/core/src/java/org/apache/solr/cloud/StatePublisher.java
@@ -22,6 +22,7 @@ import org.apache.solr.common.ParWork;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.Utils;
@@ -212,6 +213,11 @@ public class StatePublisher implements Closeable {
String collection = stateMessage.getStr(ZkStateReader.COLLECTION_PROP);
String state = stateMessage.getStr(ZkStateReader.STATE_PROP);
+ if (core == null || state == null) {
+ log.error("Nulls in published state");
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Nulls in published state " + stateMessage);
+ }
+
if ((state.equals(UpdateLog.State.ACTIVE.toString().toLowerCase(Locale.ROOT)) || state.equals("leader")) && cc.isCoreLoading(core)) {
cc.waitForLoadingCore(core, 10000);
}
@@ -224,17 +230,13 @@ public class StatePublisher implements Closeable {
} else {
id = stateMessage.getStr("id");
}
- // MRM TODO: this needs thought and work - what about session recovery? what about zkshardterm recovery?
-// CacheEntry lastState = stateCache.get(id);
-// if (collection != null && replica != null && (System.currentTimeMillis() - lastState.time < 1000) && !state.equals(lastState.state) && replica.getState().toString().equals(state)) {
-// log.info("Skipping publish state as {} for {}, because it was the last state published", state, core);
-// return;
-// }
- }
- if (core == null || state == null) {
- log.error("Nulls in published state");
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Nulls in published state " + stateMessage);
+ CacheEntry lastState = stateCache.get(id);
+ //&& (System.currentTimeMillis() - lastState.time < 1000) &&
+ if (!state.equals("leader") && collection != null && lastState != null && replica != null && !state.equals(lastState.state) && replica.getState().toString().equals(state)) {
+ log.info("Skipping publish state as {} for {}, because it was the last state published", state, core);
+ return;
+ }
}
if (id == null) {
@@ -297,7 +299,11 @@ public class StatePublisher implements Closeable {
}
public void clearStatCache(String core) {
- // stateCache.remove(core);
+ stateCache.remove(core);
+ }
+
+ public void clearStatCache() {
+ stateCache.clear();
}
public void start() {
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 9f69564..c205778 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -447,6 +447,8 @@ public class ZkController implements Closeable, Runnable {
removeEphemeralLiveNode();
+ statePublisher.clearStatCache();
+
// recreate our watchers first so that they exist even on any problems below
zkStateReader.createClusterStateWatchersAndUpdate();
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 20c4f55..06675de 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -112,35 +112,22 @@ public class ZkStateWriter {
throw new NullPointerException("clusterState cannot be null");
}
-
clusterState.forEachCollection(collection -> {
- idToCollection.put(collection.getId(), collection.getName());
-// if (trackVersions.get(collection.getName()) == null) {
-// DocCollection latestColl = reader.getClusterState().getCollectionOrNull(collection.getName()).copy();
-//
-// if (latestColl == null) {
-// reader.forciblyRefreshClusterStateSlow(collection.getName());
-// latestColl = reader.getClusterState().getCollectionOrNull(collection.getName()).copy();
-// }
-//
-// if (latestColl == null) {
-// //log.info("no node exists, using version 0");
-// trackVersions.remove(collection.getName());
-// } else {
-// int version = latestColl.getZNodeVersion();
-//
-// log.debug("Updating local tracked version to {} for {}", version, collection.getName());
-// trackVersions.put(collection.getName(), version);
-// }
-// }
-
DocCollection currentCollection = cs.getCollectionOrNull(collection.getName());
log.debug("zkwriter collection={}", collection);
log.debug("zkwriter currentCollection={}", currentCollection);
+ idToCollection.put(collection.getId(), collection.getName());
+
+ if (currentCollection != null) {
+ if (currentCollection.getId() != collection.getId()) {
+ removeCollection(collection.getName());
+ }
+ }
+
+ if (currentCollection != null) {
- if (currentCollection != null && currentCollection.getId() == collection.getId()) {
currentCollection.getProperties().keySet().retainAll(collection.getProperties().keySet());
for (Slice slice : collection) {
@@ -612,8 +599,6 @@ public class ZkStateWriter {
cs.getCollectionStates().remove(collection);
assignMap.remove(collection);
trackVersions.remove(collection);
- reader.getZkClient().delete(ZkStateReader.getCollectionSCNPath(collection), -1, true, false);
- reader.getZkClient().delete(ZkStateReader.getCollectionStateUpdatesPath(collection), -1, true, false);
dirtyStructure.remove(collection);
dirtyState.remove(collection);
ZkNodeProps message = new ZkNodeProps("name", collection);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
index 2a7701d..b5ce87c 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
@@ -524,7 +524,7 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
String sliceName = slice.getName();
Replica leader;
try {
- leader = zkController.getZkStateReader().getLeaderRetry(collection, sliceName);
+ leader = zkController.getZkStateReader().getLeaderRetry(collection, sliceName, 10000);
} catch (Exception e) {
throw new SolrException(ErrorCode.SERVER_ERROR, "error getting leader", e);
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index d11471c..228b60b 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -2314,6 +2314,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
return new ConcurrentUpdateSolrClient.Builder(baseSolrUrl)
.withQueueSize(queueSize)
.withThreadCount(threadCount)
+ .withSocketTimeout(120000)
.build();
}
[lucene] 02/07: @1438 Small tweaks for mocky tests.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 8876bf7d0da89784c0b3badd6626d9871a943454
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 19:28:08 2021 -0600
@1438 Small tweaks for mocky tests.
---
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 12 ++++++------
.../core/src/test/org/apache/solr/cloud/NodeMutatorTest.java | 1 -
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index b57013e..4ce3f6c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -327,7 +327,7 @@ public class Overseer implements SolrCloseable {
//systemCollectionCompatCheck(new StringBiConsumer());
this.zkStateWriter.init();
- queueWatcher = new WorkQueueWatcher(getCoreContainer());
+ queueWatcher = new WorkQueueWatcher(getCoreContainer(), this);
collectionQueueWatcher = new WorkQueueWatcher.CollectionWorkQueueWatcher(getCoreContainer(), id, overseerLbClient, adminPath, stats, Overseer.this);
try {
queueWatcher.start();
@@ -723,10 +723,10 @@ public class Overseer implements SolrCloseable {
protected volatile boolean closed;
protected final ReentrantLock ourLock = new ReentrantLock(true);
- public QueueWatcher(CoreContainer cc, String path) throws KeeperException {
+ public QueueWatcher(CoreContainer cc, Overseer overseer, String path) throws KeeperException {
this.cc = cc;
this.zkController = cc.getZkController();
- this.overseer = zkController.getOverseer();
+ this.overseer = overseer;
this.path = path;
}
@@ -802,8 +802,8 @@ public class Overseer implements SolrCloseable {
private static class WorkQueueWatcher extends QueueWatcher {
- public WorkQueueWatcher(CoreContainer cc) throws KeeperException {
- super(cc, Overseer.OVERSEER_QUEUE);
+ public WorkQueueWatcher(CoreContainer cc, Overseer overseer) throws KeeperException {
+ super(cc, overseer, Overseer.OVERSEER_QUEUE);
}
@@ -866,7 +866,7 @@ public class Overseer implements SolrCloseable {
private final DistributedMap completedMap;
public CollectionWorkQueueWatcher(CoreContainer cc, String myId, LBHttp2SolrClient overseerLbClient, String adminPath, Stats stats, Overseer overseer) throws KeeperException {
- super(cc, Overseer.OVERSEER_COLLECTION_QUEUE_WORK);
+ super(cc, overseer, Overseer.OVERSEER_COLLECTION_QUEUE_WORK);
collMessageHandler = new OverseerCollectionMessageHandler(cc, myId, overseerLbClient, adminPath, stats, overseer);
configMessageHandler = new OverseerConfigSetMessageHandler(cc);
failureMap = Overseer.getFailureMap(cc.getZkController().getZkClient());
diff --git a/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java b/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java
index 3b2d74d..ef82155 100644
--- a/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.cloud;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.SolrTestCaseJ4Test;
import org.apache.solr.cloud.overseer.NodeMutator;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.ZkStateReader;
[lucene] 04/07: @1440 Debug logging.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 15c0f97a59535f969c740065b13d9cff79d24db6
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 20:21:54 2021 -0600
@1440 Debug logging.
Took 4 minutes
---
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index e3b9e0c..cfcd396 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -2378,7 +2378,7 @@ public class CoreContainer implements Closeable {
try {
Files.delete(file);
} catch (IOException e) {
- log.info("Could not delete file {} {} {}", file, e.getClass().getName(), e.getMessage());
+ log.debug("Could not delete file {} {} {}", file, e.getClass().getName(), e.getMessage());
}
}
}
[lucene] 05/07: @1441 Log it for the load tests, don't kill it.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit f2dcb3f439f0093c7822270f081d98d15353e564
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 20:54:01 2021 -0600
@1441 Log it for the load tests, don't kill it.
Took 28 minutes
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 c205778..2a78b18 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1263,7 +1263,7 @@ public class ZkController implements Closeable, Runnable {
Replica replica = docCollection.getReplica(coreName);
if (replica != null && !baseUrl.equals(replica.getBaseUrl())) {
log.error("wrong base url for this node in replica entry replica={}", replica);
- throw new IllegalArgumentException("wrong base url for this node in replica entry baseUrl=" + baseUrl + " replica=" + replica);
+ //throw new IllegalArgumentException("wrong base url for this node in replica entry baseUrl=" + baseUrl + " replica=" + replica);
}
}
[lucene] 06/07: @1442 Raise timeout to be more reasonable.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to tag history/branches/lucene-solr/reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 211313290aad6d1d6fb715d9f315d8586b53e0ac
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Mar 9 21:18:04 2021 -0600
@1442 Raise timeout to be more reasonable.
Took 13 minutes
---
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index ed52df4..9ace841 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -503,7 +503,7 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
if (stat == null) {
if (log.isDebugEnabled()) log.debug("Collections znode not found, waiting on latch");
try {
- boolean success = latch.await(1000, TimeUnit.MILLISECONDS);
+ boolean success = latch.await(15000, TimeUnit.MILLISECONDS);
if (!success) {
throw new SolrException(ErrorCode.SERVER_ERROR, "cluster not found/not ready");
}