Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 67d17644f -> d5f670cd9
SOLR-11067: improve tests logging
(cherry picked from commit 8760e3225fe98c23210a0c73aff4c8f56bb7f39f)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/00d3271c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/00d3271c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/00d3271c
Branch: refs/heads/branch_7x
Commit: 00d3271c97f15dcdfcfc0f9731c358df7b0e89e6
Parents: ad9182a
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Feb 26 16:37:24 2018 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Feb 26 16:37:39 2018 -0700
----------------------------------------------------------------------
.../solr/cloud/ReplaceNodeNoTargetTest.java | 38 +++++++++++++++-----
1 file changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/00d3271c/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
index 769ddce..09691f3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
@@ -71,28 +71,48 @@ public class ReplaceNodeNoTargetTest extends SolrCloudTestCase {
SolrRequest req = createAutoScalingRequest(SolrRequest.METHOD.POST, setClusterPolicyCommand);
solrClient.request(req);
+ log.info("Creating collection...");
CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(coll, "conf1", 5, 2, 0, 0);
-
cloudClient.request(create);
+
+ log.info("Current core status list for node we plan to decommision: {} => {}",
+ node2bdecommissioned,
+ getCoreStatusForNamedNode(cloudClient, node2bdecommissioned).getCoreStatus());
+
+ log.info("Decommisioning node: " + node2bdecommissioned);
createReplaceNodeRequest(node2bdecommissioned, null, null).processAsync("001", cloudClient);
CollectionAdminRequest.RequestStatus requestStatus = CollectionAdminRequest.requestStatus("001");
boolean success = false;
+ CollectionAdminRequest.RequestStatusResponse rsp = null;
for (int i = 0; i < 300; i++) {
- CollectionAdminRequest.RequestStatusResponse rsp = requestStatus.process(cloudClient);
+ rsp = requestStatus.process(cloudClient);
if (rsp.getRequestStatus() == RequestStatusState.COMPLETED) {
success = true;
break;
}
- assertFalse(rsp.getRequestStatus() == RequestStatusState.FAILED);
+ assertFalse("async replace node request aparently failed: " + rsp.toString(),
+
+ rsp.getRequestStatus() == RequestStatusState.FAILED);
Thread.sleep(50);
}
- assertTrue(success);
- try (HttpSolrClient coreclient = getHttpSolrClient(cloudClient.getZkStateReader().getBaseUrlForNodeName(node2bdecommissioned))) {
- CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreclient);
- assertTrue(status.getCoreStatus().size() == 0);
- }
-
+ assertTrue("async replace node request should have finished successfully by now, last status: " + rsp,
+ success);
+ CoreAdminResponse status = getCoreStatusForNamedNode(cloudClient, node2bdecommissioned);
+ assertEquals("Expected no cores for decommisioned node: "
+ + status.getCoreStatus().toString(),
+ 0, status.getCoreStatus().size());
}
+ /**
+ * Given a cloud client and a nodename, build an HTTP client for that node, and ask it for it's core status
+ */
+ private CoreAdminResponse getCoreStatusForNamedNode(final CloudSolrClient cloudClient,
+ final String nodeName) throws Exception {
+
+ try (HttpSolrClient coreclient = getHttpSolrClient
+ (cloudClient.getZkStateReader().getBaseUrlForNodeName(nodeName))) {
+ return CoreAdminRequest.getStatus(null, coreclient);
+ }
+ }
}
Merge remote-tracking branch 'refs/remotes/origin/branch_7x' into branch_7x Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d5f670cd Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d5f670cd Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d5f670cd Branch: refs/heads/branch_7x Commit: d5f670cd95d1947dca2522bcb3370afa72750aa5 Parents: 00d3271 67d1764 Author: Chris Hostetter <ho...@apache.org> Authored: Mon Feb 26 16:51:44 2018 -0700 Committer: Chris Hostetter <ho...@apache.org> Committed: Mon Feb 26 16:51:44 2018 -0700 ---------------------------------------------------------------------- dev-tools/scripts/reproduceJenkinsFailures.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) ----------------------------------------------------------------------