From 2a0b7767abcfc1e6a78abb784120d913489da7b8 Mon Sep 17 00:00:00 2001
From: Varun Thacker <varun@apache.org>
Date: Fri, 9 Mar 2018 16:35:56 -0800
Subject: [PATCH] SOLR-12076: Remove unnecessary printLayout usage in CDCR
 tests

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

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8f5c0c3a2b6..a49106a8b42 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -50,7 +50,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 ==================
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 cd45c159f3b..4e4a2999aab 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);
     }