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 2021/03/11 16:46:55 UTC
[lucene-solr] branch reference_impl updated: @1450 Write out props
and some fixes.
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
The following commit(s) were added to refs/heads/reference_impl by this push:
new 58c138a @1450 Write out props and some fixes.
58c138a is described below
commit 58c138aa9ac87c27cf165fce5966b52d9bb45bc0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Mar 11 10:46:28 2021 -0600
@1450 Write out props and some fixes.
Took 13 minutes
---
solr/core/src/java/org/apache/solr/core/CoreDescriptor.java | 3 ++-
.../core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java | 2 +-
.../src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
index f8f5ac6..d210de6 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
@@ -121,7 +121,8 @@ public class CoreDescriptor {
CORE_COLLECTION,
CORE_ROLES,
CORE_NODE_NAME,
- CloudDescriptor.NUM_SHARDS
+ CloudDescriptor.NUM_SHARDS,
+ "id"
);
private final CloudDescriptor cloudDesc;
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
index beaa639..6157d2d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
@@ -171,7 +171,7 @@ public class ChaosMonkeySafeLeaderTest extends SolrCloudBridgeTestCase {
assertTrue(String.valueOf(indexThread.getFailCount()), indexThread.getFailCount() < 10);
}
- cluster.getSolrClient().getZkStateReader().waitForState(COLLECTION, 10, TimeUnit.SECONDS, (liveNodes, collectionState) -> {
+ cluster.getSolrClient().getZkStateReader().waitForState(COLLECTION, 30, TimeUnit.SECONDS, (liveNodes, collectionState) -> {
if (collectionState == null) return false;
Collection<Slice> slices = collectionState.getSlices();
for (Slice slice : slices) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
index 27ffee4..a699fd4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java
@@ -64,6 +64,8 @@ public class TestDownShardTolerantSearch extends SolrCloudTestCase {
JettySolrRunner stoppedServer = cluster.stopJettySolrRunner(0);
+ cluster.waitForJettyToStop(stoppedServer);
+
try (SolrClient client = cluster.buildSolrClient()) {
response = client.query("tolerant", new SolrQuery("*:*").setRows(1).setParam(ShardParams.SHARDS_TOLERANT, true));