lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject lucene-solr:branch_7x: SOLR-12076: Remove unnecessary printLayout usage in CDCR tests
Date Mon, 12 Mar 2018 18:11:51 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 78d592d2f -> 6b8a20264


SOLR-12076: Remove unnecessary printLayout usage in CDCR tests

(cherry picked from commit 2a0b776)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6b8a2026
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6b8a2026
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6b8a2026

Branch: refs/heads/branch_7x
Commit: 6b8a20264b83f997bb6e936bce20c8a20c38c004
Parents: 78d592d
Author: Varun Thacker <varun@apache.org>
Authored: Fri Mar 9 16:35:56 2018 -0800
Committer: Varun Thacker <varun@apache.org>
Committed: Mon Mar 12 11:11:27 2018 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt                                   | 17 ++++++++++++++++-
 .../solr/cloud/cdcr/BaseCdcrDistributedZkTest.java |  8 --------
 2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6b8a2026/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 127f20b..d974cdf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -30,7 +30,22 @@ Apache ZooKeeper 3.4.11
 Jetty 9.4.8.v20171121
 
 
-(No Changes)
+Upgrade Notes
+----------------------
+
+New Features
+----------------------
+
+Bug Fixes
+----------------------
+
+Optimizations
+----------------------
+
+Other Changes
+----------------------
+
+* SOLR-12076: Remove unnecessary printLayout usage in CDCR tests (Varun Thacker)
 
 
 ==================  7.3.0 ==================

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6b8a2026/solr/core/src/test/org/apache/solr/cloud/cdcr/BaseCdcrDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/cdcr/BaseCdcrDistributedZkTest.java
b/solr/core/src/test/org/apache/solr/cloud/cdcr/BaseCdcrDistributedZkTest.java
index cd45c15..4e4a299 100644
--- a/solr/core/src/test/org/apache/solr/cloud/cdcr/BaseCdcrDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/cdcr/BaseCdcrDistributedZkTest.java
@@ -49,7 +49,6 @@ import org.apache.solr.common.cloud.ClusterState;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkCoreNodeProps;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkStateReader;
@@ -198,12 +197,6 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase
{
     return server;
   }
 
-  protected void printLayout() throws Exception {
-    SolrZkClient zkClient = new SolrZkClient(zkServer.getZkHost(), AbstractZkTestCase.TIMEOUT);
-    zkClient.printLayoutToStdOut();
-    zkClient.close();
-  }
-
   protected SolrInputDocument getDoc(Object... fields) throws Exception {
     SolrInputDocument doc = new SolrInputDocument();
     addFields(doc, fields);
@@ -606,7 +599,6 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase
{
 
     // now wait till we see the leader for each shard
     for (int i = 1; i <= shardCount; i++) {
-      this.printLayout();
       zkStateReader.getLeaderRetry(temporaryCollection, "shard" + i, 15000);
     }
 


Mime
View raw message