You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/08/04 00:49:30 UTC
svn commit: r1369245 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Author: markrmiller
Date: Fri Aug 3 22:49:29 2012
New Revision: 1369245
URL: http://svn.apache.org/viewvc?rev=1369245&view=rev
Log:
LUCENE-3985: missed updating test file
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1369245&r1=1369244&r2=1369245&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Fri Aug 3 22:49:29 2012
@@ -905,11 +905,15 @@ public class OverseerTest extends SolrTe
private SolrZkClient electNewOverseer(String address) throws InterruptedException,
- TimeoutException, IOException, KeeperException, ParserConfigurationException, SAXException {
- SolrZkClient zkClient = new SolrZkClient(address, TIMEOUT);
+ TimeoutException, IOException,
+ KeeperException, ParserConfigurationException, SAXException {
+ SolrZkClient zkClient = new SolrZkClient(address, TIMEOUT);
ZkStateReader reader = new ZkStateReader(zkClient);
LeaderElector overseerElector = new LeaderElector(zkClient);
- ElectionContext ec = new OverseerElectionContext(new HttpShardHandlerFactory().getShardHandler(), "/admin/cores", address.replaceAll("/", "_"), reader);
+ // TODO: close Overseer
+ Overseer overseer = new Overseer(
+ new HttpShardHandlerFactory().getShardHandler(), "/admin/cores", reader);
+ ElectionContext ec = new OverseerElectionContext(zkClient, overseer, address.replaceAll("/", "_"));
overseerElector.setup(ec);
overseerElector.joinElection(ec);
return zkClient;