You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by md...@apache.org on 2020/12/04 00:50:06 UTC
[lucene-solr] branch branch_8x updated: SOLR-14992 Wait for node
down before checking for node up (#2115)
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new f7af02e SOLR-14992 Wait for node down before checking for node up (#2115)
f7af02e is described below
commit f7af02ebe39d448f74413ddba575ba1d96059210
Author: Mike Drob <md...@apache.org>
AuthorDate: Thu Dec 3 16:32:07 2020 -0800
SOLR-14992 Wait for node down before checking for node up (#2115)
---
.../src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
index d66b313..deb2dd0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
@@ -126,6 +126,7 @@ public class TestPullReplicaErrorHandling extends SolrCloudTestCase {
collectionName = suggestedCollectionName();
expectThrows(SolrException.class, () -> getCollectionState(collectionName));
cluster.getSolrClient().setDefaultCollection(collectionName);
+ cluster.waitForAllNodes(30);
}
@Override
@@ -254,8 +255,9 @@ public void testCantConnectToPullReplica() throws Exception {
JettySolrRunner jetty = getJettyForReplica(s.getReplicas(EnumSet.of(Replica.Type.PULL)).get(0));
SolrCore core = jetty.getCoreContainer().getCores().iterator().next();
- for (int i = 0; i < 5; i++) {
+ for (int i = 0; i < (TEST_NIGHTLY ? 5 : 2); i++) {
cluster.expireZkSession(jetty);
+ waitForState("Expecting node to be disconnected", collectionName, activeReplicaCount(1, 0, 0));
waitForState("Expecting node to reconnect", collectionName, activeReplicaCount(1, 0, 1));
// We have two active ReplicationHandler with two close hooks each, one for triggering recovery and one for doing interval polling
assertEquals(5, core.getCloseHooks().size());