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/10/29 14:37:12 UTC
[lucene-solr] branch reference_impl_dev updated: @1069 Harden.
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
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 0cd4c6e @1069 Harden.
0cd4c6e is described below
commit 0cd4c6e33895e4972df0790c7b8b741f00a222b8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 29 09:36:55 2020 -0500
@1069 Harden.
---
solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java | 4 ++--
.../test/org/apache/solr/client/solrj/io/stream/StreamingTest.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
index c933cb4..8fc1e19 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
@@ -141,11 +141,11 @@ public class RecoveryZkTest extends SolrCloudTestCase {
indexThread.join();
indexThread2.join();
+ cluster.waitForActiveCollection(collection, 1, 2);
+
new UpdateRequest()
.commit(cluster.getSolrClient(), collection);
- cluster.waitForActiveCollection(collection, 1, 2);
-
// test that leader and replica have same doc count
state = getCollectionState(collection);
assertShardConsistency(state.getSlice("shard1"), true);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
index 9b75efd..7b3bcc4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
@@ -100,7 +100,8 @@ public static void configureCluster() throws Exception {
.configure();
String collection;
- useAlias = random().nextBoolean();
+ // nocommit
+ useAlias = false; //random().nextBoolean();
if (useAlias) {
collection = COLLECTIONORALIAS + "_collection";
} else {