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/26 20:53:31 UTC
[lucene-solr] branch reference_impl updated (d953cf4 -> b6a4b01)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from d953cf4 @356 You can't have different thread filters for different tests.
new 57468ed @357 Test fails.
new b6a4b01 @358 Turn orderly shutdown back on, but don't call it from MiniSolrCloudCluster currently.
The 2 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.
Summary of changes:
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 11 -----------
.../solr/cloud/TestTolerantUpdateProcessorRandomCloud.java | 1 +
.../org/apache/solr/handler/admin/IndexSizeEstimatorTest.java | 3 +--
3 files changed, 2 insertions(+), 13 deletions(-)
[lucene-solr] 02/02: @358 Turn orderly shutdown back on,
but don't call it from MiniSolrCloudCluster currently.
Posted by ma...@apache.org.
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 b6a4b01bc9242576056255e5b698859064768f58
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 15:51:25 2020 -0500
@358 Turn orderly shutdown back on, but don't call it from MiniSolrCloudCluster currently.
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 11 -----------
1 file changed, 11 deletions(-)
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 5309604..11b2a82 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1291,17 +1291,6 @@ public class ZkController implements Closeable {
}
}
- try {
- ParWork.close(cc);
- } catch (Exception e) {
- log.error("Exception on shutdown", e);
- return;
- } finally {
- if (zkClient != null) {
- zkClient.disableCloseLock();
- }
- ParWork.close(zkClient);
- }
URL url = null;
try {
url = new URL(getHostName() + ":" + getHostPort() + "/shutdown?token=" + "solrrocks");
[lucene-solr] 01/02: @357 Test fails.
Posted by ma...@apache.org.
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 57468eda1ebf2638e38efbefd5db83a9dd90d18b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 15:50:53 2020 -0500
@357 Test fails.
---
.../org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java | 1 +
.../src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
index 010dfa2..e810778 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
@@ -108,6 +108,7 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION_NAME, configName, numShards, repFactor)
.setProperties(collectionProperties)
+ .setMaxShardsPerNode(10)
.process(CLOUD_CLIENT);
if (NODE_CLIENTS != null) {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java
index f4b1e57..92c2731 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java
@@ -77,8 +77,7 @@ public class IndexSizeEstimatorTest extends SolrCloudTestCase {
.configure();
solrClient = cluster.getSolrClient();
CollectionAdminRequest.createCollection(collection, "conf", 2, 2)
- .setMaxShardsPerNode(2).process(solrClient);
- cluster.waitForActiveCollection(collection, 2, 4);
+ .setMaxShardsPerNode(5).process(solrClient);
SolrInputDocument lastDoc = addDocs(collection, NUM_DOCS);
HashSet<String> docFields = new HashSet<>(lastDoc.keySet());
docFields.add("_version_");