Author: markrmiller
Date: Tue Feb 2 18:03:11 2010
New Revision: 905736
URL: http://svn.apache.org/viewvc?rev=905736&view=rev
Log:
we don't actually need corecontainer in ZooKeeperController yet
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=905736&r1=905735&r2=905736&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
Tue Feb 2 18:03:11 2010
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
-import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -39,7 +38,6 @@
import org.apache.solr.cloud.SolrZkClient.OnReconnect;
import org.apache.solr.common.SolrException;
-import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
@@ -101,20 +99,19 @@
private boolean cloudStateUpdateScheduled;
-
/**
* @param zkServerAddress ZooKeeper server host address
* @param zkClientTimeout
+ * @param zkClientConnectTimeout
* @param localHost
* @param locaHostPort
* @param localHostContext
- * @param coreContainer
* @throws InterruptedException
* @throws TimeoutException
* @throws IOException
*/
public ZkController(String zkServerAddress, int zkClientTimeout, int
zkClientConnectTimeout, String localHost, String locaHostPort,
- String localHostContext, final CoreContainer coreContainer) throws
InterruptedException,
+ String localHostContext) throws InterruptedException,
TimeoutException, IOException {
this.zkServerAddress = zkServerAddress;
this.localHostPort = locaHostPort;
@@ -129,15 +126,7 @@
try {
createEphemeralLiveNode();
- // register cores in case any new cores came online will zk was
down
-
- // coreContainer may currently be null in tests, so don't
re-register
- if(coreContainer != null) {
- Collection<SolrCore> cores = coreContainer.getCores();
- for(SolrCore core : cores) {
- register(core, false);
- }
- }
+
updateCloudState(false);
} catch (KeeperException e) {
log.error("", e);
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=905736&r1=905735&r2=905736&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
Tue Feb 2 18:03:11 2010
@@ -124,7 +124,7 @@
if (zkRun != null && zkServer.getServers().size() > 1)
zkClientConnectTimeout = 24 * 60 * 60 * 1000; // 1 day for embedded
ensemble
- zooKeeperController = new ZkController(zookeeperHost, zkClientTimeout,
zkClientConnectTimeout, host, hostPort, hostContext, this);
+ zooKeeperController = new ZkController(zookeeperHost, zkClientTimeout,
zkClientConnectTimeout, host, hostPort, hostContext);
String confDir = System.getProperty("bootstrap_confdir");
if(confDir != null) {
