You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/03/13 03:32:25 UTC
lucene-solr:master: SOLR-12028: Remove BadApples for
ZkShardTermsTest.testParticipationOfReplicas
Repository: lucene-solr
Updated Branches:
refs/heads/master 68d8eb450 -> 0cd9f7f35
SOLR-12028: Remove BadApples for ZkShardTermsTest.testParticipationOfReplicas
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0cd9f7f3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0cd9f7f3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0cd9f7f3
Branch: refs/heads/master
Commit: 0cd9f7f35af84ce769a37a2ef1afe8990c5b061a
Parents: 68d8eb4
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Mar 13 10:32:10 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Mar 13 10:32:10 2018 +0700
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/ZkShardTermsTest.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0cd9f7f3/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
index c7f1cdb..7b715a1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
@@ -52,7 +52,6 @@ public class ZkShardTermsTest extends SolrCloudTestCase {
}
@Test
- @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void testParticipationOfReplicas() throws IOException, SolrServerException, InterruptedException {
String collection = "collection1";
try (ZkShardTerms zkShardTerms = new ZkShardTerms(collection, "shard2", cluster.getZkClient())) {
@@ -66,11 +65,14 @@ public class ZkShardTermsTest extends SolrCloudTestCase {
.setCreateNodeSet(cluster.getJettySolrRunner(0).getNodeName())
.setMaxShardsPerNode(1000)
.process(cluster.getSolrClient());
- ZkController zkController = cluster.getJettySolrRunners().get(0).getCoreContainer().getZkController();
- waitFor(2, () -> zkController.getShardTerms(collection, "shard1").getTerms().size());
- assertArrayEquals(new Long[]{0L, 0L}, zkController.getShardTerms(collection, "shard1").getTerms().values().toArray(new Long[2]));
- waitFor(2, () -> zkController.getShardTerms(collection, "shard2").getTerms().size());
- assertArrayEquals(new Long[]{0L, 0L}, zkController.getShardTerms(collection, "shard2").getTerms().values().toArray(new Long[2]));
+ try (ZkShardTerms zkShardTerms = new ZkShardTerms(collection, "shard1", cluster.getZkClient())) {
+ waitFor(2, () -> zkShardTerms.getTerms().size());
+ assertArrayEquals(new Long[]{0L, 0L}, zkShardTerms.getTerms().values().toArray(new Long[2]));
+ }
+ try (ZkShardTerms zkShardTerms = new ZkShardTerms(collection, "shard2", cluster.getZkClient())) {
+ waitFor(2, () -> zkShardTerms.getTerms().size());
+ assertArrayEquals(new Long[]{0L, 0L}, zkShardTerms.getTerms().values().toArray(new Long[2]));
+ }
}
public void testRegisterTerm() throws InterruptedException {