Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12076: Remove unnecessary printLayout usage in CDCR tests

This commit is contained in:
Varun Thacker 2018-03-09 16:35:56 -08:00
parent 28ddb5f355
commit 2a0b7767ab
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
solr/CHANGES.txt
View File

@ -50,7 +50,22 @@ Apache ZooKeeper 3.4.11
Jetty 9.4.8.v20171121 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 ================== ================== 7.3.0 ==================

8
solr/core/src/test/org/apache/solr/cloud/cdcr/BaseCdcrDistributedZkTest.java
View File

@ -49,7 +49,6 @@ import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice; 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.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps; import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZkStateReader;
@ -198,12 +197,6 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase {
return server; 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 { protected SolrInputDocument getDoc(Object... fields) throws Exception {
SolrInputDocument doc = new SolrInputDocument(); SolrInputDocument doc = new SolrInputDocument();
addFields(doc, fields); addFields(doc, fields);
@ -606,7 +599,6 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase {
// now wait till we see the leader for each shard // now wait till we see the leader for each shard
for (int i = 1; i <= shardCount; i++) { for (int i = 1; i <= shardCount; i++) {
this.printLayout();
zkStateReader.getLeaderRetry(temporaryCollection, "shard" + i, 15000); zkStateReader.getLeaderRetry(temporaryCollection, "shard" + i, 15000);
} }