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

SOLR-3063: Bug in LeaderElectionIntgrationTest 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1237193 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-01-29 02:12:00 +00:00
parent 23e845d479
commit 9a1222efc5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
View File

@ -102,7 +102,7 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
private static void putConfig(SolrZkClient zkClient, final String name) private static void putConfig(SolrZkClient zkClient, final String name)
throws Exception { throws Exception {
zkClient.makePath("/configs/conf1/" + name, getFile("solr" zkClient.makePath("/configs/conf1/" + name, getFile("solr"
+ File.separator + "conf" + File.separator + name), false, false); + File.separator + "conf" + File.separator + name), false, true);
} }
@Override @Override

3
solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
View File

@ -100,7 +100,7 @@ public class LeaderElectionIntegrationTest extends SolrTestCaseJ4 {
AbstractZkTestCase.TIMEOUT); AbstractZkTestCase.TIMEOUT);
reader = new ZkStateReader(zkClient); reader = new ZkStateReader(zkClient);
reader.createClusterStateWatchersAndUpdate();
log.info("####SETUP_END " + getName()); log.info("####SETUP_END " + getName());
} }
@ -217,7 +217,6 @@ public class LeaderElectionIntegrationTest extends SolrTestCaseJ4 {
private String getLeader() throws InterruptedException, KeeperException { private String getLeader() throws InterruptedException, KeeperException {
reader.updateCloudState(true);
ZkNodeProps props = reader.getLeaderProps("collection1", "shard1", 30000); ZkNodeProps props = reader.getLeaderProps("collection1", "shard1", 30000);
String leader = props.get(ZkStateReader.NODE_NAME_PROP); String leader = props.get(ZkStateReader.NODE_NAME_PROP);