Author: markrmiller
Date: Sat Jan 2 19:45:25 2010
New Revision: 895273
URL: http://svn.apache.org/viewvc?rev=895273&view=rev
Log:
be consistent about zk as ZooKeeper
Added:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
- copied, changed from r895265,
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperController.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
- copied, changed from r895087,
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperSolrResourceLoader.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
- copied, changed from r895265,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZooKeeperTestCase.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
- copied, changed from r895265,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZooKeeperTestCase.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
- copied, changed from r895087,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZooKeeperTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZkTest.java
- copied, changed from r894959,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZooKeeperTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZkFailuresTest.java
- copied, changed from r894959,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZooKeeperFailuresTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
- copied, changed from r895265,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperControllerTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java
- copied, changed from r895087,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperTestServer.java
Removed:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperController.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperSolrResourceLoader.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZooKeeperTestCase.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZooKeeperTestCase.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZooKeeperTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZooKeeperTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZooKeeperFailuresTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperControllerTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperTestServer.java
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
Copied:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
(from r895265,
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperController.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?p2=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java&p1=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperController.java&r1=895265&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperController.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
Sat Jan 2 19:45:25 2010
@@ -56,7 +56,7 @@
*
* TODO: handle ZooKeeper goes down / failures, Solr still runs
*/
-public final class ZooKeeperController {
+public final class ZkController {
static final String NEWL = System.getProperty("line.separator");
private static final String COLLECTIONS_ZKNODE = "/collections/";
@@ -77,9 +77,9 @@
// watches the shards zkNode
static class ShardsWatcher implements Watcher {
- private ZooKeeperController controller;
+ private ZkController controller;
- public ShardsWatcher(ZooKeeperController controller) {
+ public ShardsWatcher(ZkController controller) {
this.controller = controller;
}
@@ -118,7 +118,7 @@
private final static Pattern URL_PREFIX = Pattern.compile("(https?://).*");
private static Logger log = LoggerFactory
- .getLogger(ZooKeeperController.class);
+ .getLogger(ZkController.class);
private SolrZkClient zkClient;
@@ -156,7 +156,7 @@
* @throws TimeoutException
* @throws InterruptedException
*/
- public ZooKeeperController(String zkServerAddress, String collection,
+ public ZkController(String zkServerAddress, String collection,
String hostUrl, String hostPort, String hostContext, int
zkClientTimeout) throws InterruptedException, TimeoutException, IOException {
this.collectionName = collection;
Copied:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
(from r895087,
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperSolrResourceLoader.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java?p2=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java&p1=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperSolrResourceLoader.java&r1=895087&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperSolrResourceLoader.java
(original)
+++
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
Sat Jan 2 19:45:25 2010
@@ -27,13 +27,13 @@
* ResourceLoader that works with ZooKeeper.
*
*/
-public class ZooKeeperSolrResourceLoader extends SolrResourceLoader {
+public class ZkSolrResourceLoader extends SolrResourceLoader {
private String collection;
- private ZooKeeperController zkController;
+ private ZkController zkController;
- public ZooKeeperSolrResourceLoader(String instanceDir, String collection,
- ZooKeeperController zooKeeperController) {
+ public ZkSolrResourceLoader(String instanceDir, String collection,
+ ZkController zooKeeperController) {
super(instanceDir);
this.zkController = zooKeeperController;
this.collection = collection;
@@ -47,8 +47,8 @@
* the "lib/" directory in the specified instance directory.
* <p>
*/
- public ZooKeeperSolrResourceLoader(String instanceDir, String collection,
ClassLoader parent,
- Properties coreProperties, ZooKeeperController zooKeeperController) {
+ public ZkSolrResourceLoader(String instanceDir, String collection,
ClassLoader parent,
+ Properties coreProperties, ZkController zooKeeperController) {
super(instanceDir, parent, coreProperties);
this.collection = collection;
this.zkController = zooKeeperController;
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=895273&r1=895272&r2=895273&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
Sat Jan 2 19:45:25 2010
@@ -32,8 +32,8 @@
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpressionException;
-import org.apache.solr.cloud.ZooKeeperSolrResourceLoader;
-import org.apache.solr.cloud.ZooKeeperController;
+import org.apache.solr.cloud.ZkSolrResourceLoader;
+import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.util.DOMUtil;
@@ -83,7 +83,7 @@
protected String zkPortOverride;
protected String collection;
private String testShardsListOverride;
- private ZooKeeperController zooKeeperController;
+ private ZkController zooKeeperController;
private String zkHost;
@@ -104,7 +104,7 @@
if (zookeeperHost != null) {
try {
// nocommit : exceptions
- zooKeeperController = new ZooKeeperController(zookeeperHost,
collection, host, hostPort, hostContext, zkClientTimeout);
+ zooKeeperController = new ZkController(zookeeperHost, collection,
host, hostPort, hostContext, zkClientTimeout);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -490,7 +490,7 @@
solrLoader = new SolrResourceLoader(instanceDir, libLoader,
getCoreProps(instanceDir, dcore.getPropertiesName(),dcore.getCoreProperties()));
config = new SolrConfig(solrLoader, dcore.getConfigName(), null);
} else {
- solrLoader = new ZooKeeperSolrResourceLoader(instanceDir, collection,
libLoader, getCoreProps(instanceDir,
dcore.getPropertiesName(),dcore.getCoreProperties()), zooKeeperController);
+ solrLoader = new ZkSolrResourceLoader(instanceDir, collection,
libLoader, getCoreProps(instanceDir,
dcore.getPropertiesName(),dcore.getCoreProperties()), zooKeeperController);
try {
config =
zooKeeperController.getConfig(zooKeeperController.getConfigName(),
dcore.getConfigName(), solrLoader);
} catch (KeeperException e) {
@@ -947,7 +947,7 @@
return zooKeeperController != null;
}
- public ZooKeeperController getZooKeeperController() {
+ public ZkController getZooKeeperController() {
return zooKeeperController;
}
}
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java?rev=895273&r1=895272&r2=895273&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java Sat
Jan 2 19:45:25 2010
@@ -22,7 +22,7 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.store.Directory;
-import org.apache.solr.cloud.ZooKeeperController;
+import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.CommonParams.EchoParamStyle;
@@ -284,7 +284,7 @@
List<SolrEventListener> firstSearcherListeners;
List<SolrEventListener> newSearcherListeners;
- private ZooKeeperController zooKeeperComponent;
+ private ZkController zooKeeperComponent;
/**
* NOTE: this function is not thread safe. However, it is safe to call
within the
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=895273&r1=895272&r2=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
(original)
+++
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
Sat Jan 2 19:45:25 2010
@@ -44,7 +44,7 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import org.apache.lucene.util.StringHelper;
-import org.apache.solr.cloud.ZooKeeperController;
+import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.DOMUtil;
@@ -173,7 +173,7 @@
boolean exists = false;
//nocommit: double check this how we want to handle this
// check if using ZooKeeper
- ZooKeeperController zooKeeperController =
core.getCoreDescriptor().getCoreContainer().getZooKeeperController();
+ ZkController zooKeeperController =
core.getCoreDescriptor().getCoreContainer().getZooKeeperController();
if(zooKeeperController != null) {
exists = zooKeeperController.configFileExists(f);
} else {
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
(from r895265,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZooKeeperTestCase.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZooKeeperTestCase.java&r1=895265&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZooKeeperTestCase.java
(original)
+++
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
Sat Jan 2 19:45:25 2010
@@ -24,8 +24,8 @@
import org.apache.solr.core.CoreContainer;
import org.apache.solr.util.TestHarness;
-public abstract class AbstractDistributedZooKeeperTestCase extends
BaseDistributedSearchTestCase {
- private ZooKeeperTestServer zkServer;
+public abstract class AbstractDistributedZkTestCase extends
BaseDistributedSearchTestCase {
+ private ZkTestServer zkServer;
protected File tmpDir = new File(System.getProperty("java.io.tmpdir")
+ System.getProperty("file.separator") + getClass().getName() + "-"
@@ -37,14 +37,14 @@
log.info("####SETUP_START " + getName());
portSeed = 13000;
- System.setProperty("zkHost", AbstractZooKeeperTestCase.ZOO_KEEPER_HOST);
+ System.setProperty("zkHost", AbstractZkTestCase.ZOO_KEEPER_HOST);
String zkDir = tmpDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
- zkServer = new ZooKeeperTestServer(zkDir);
+ zkServer = new ZkTestServer(zkDir);
zkServer.run();
- AbstractZooKeeperTestCase.buildZooKeeper(getSolrConfigFile(),
getSchemaFile());
+ AbstractZkTestCase.buildZooKeeper(getSolrConfigFile(), getSchemaFile());
dataDir = tmpDir;
dataDir.mkdirs();
@@ -55,8 +55,8 @@
CoreContainer.Initializer init = new CoreContainer.Initializer() {
{
- this.dataDir =
AbstractDistributedZooKeeperTestCase.this.dataDir.getAbsolutePath();
- this.solrConfigFilename =
AbstractDistributedZooKeeperTestCase.this.getSolrConfigFilename();
+ this.dataDir =
AbstractDistributedZkTestCase.this.dataDir.getAbsolutePath();
+ this.solrConfigFilename =
AbstractDistributedZkTestCase.this.getSolrConfigFilename();
}
};
@@ -94,7 +94,7 @@
}
private void printeLayout() throws Exception {
- SolrZkClient zkClient = new
SolrZkClient(AbstractZooKeeperTestCase.JUST_HOST_NAME,
AbstractZooKeeperTestCase.TIMEOUT);
+ SolrZkClient zkClient = new
SolrZkClient(AbstractZkTestCase.JUST_HOST_NAME, AbstractZkTestCase.TIMEOUT);
zkClient.printLayoutToStdOut();
zkClient.close();
}
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
(from r895265,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZooKeeperTestCase.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZooKeeperTestCase.java&r1=895265&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZooKeeperTestCase.java
(original)
+++
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
Sat Jan 2 19:45:25 2010
@@ -28,22 +28,22 @@
/**
* Base test class for ZooKeeper tests.
*/
-public abstract class AbstractZooKeeperTestCase extends AbstractSolrTestCase {
+public abstract class AbstractZkTestCase extends AbstractSolrTestCase {
static final String ZOO_KEEPER_HOST = "localhost:2181/solr";
static final int TIMEOUT = 10000;
protected static Logger log = LoggerFactory
- .getLogger(AbstractZooKeeperTestCase.class);
+ .getLogger(AbstractZkTestCase.class);
protected File tmpDir = new File(System.getProperty("java.io.tmpdir")
+ System.getProperty("file.separator") + getClass().getName() + "-"
+ System.currentTimeMillis());
- private ZooKeeperTestServer zkServer;
+ private ZkTestServer zkServer;
- public AbstractZooKeeperTestCase() {
+ public AbstractZkTestCase() {
}
@@ -60,7 +60,7 @@
System.setProperty("zkHost", ZOO_KEEPER_HOST);
String zkDir = tmpDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
- zkServer = new ZooKeeperTestServer(zkDir);
+ zkServer = new ZkTestServer(zkDir);
zkServer.run();
buildZooKeeper(getSolrConfigFile(), getSchemaFile());
@@ -75,7 +75,7 @@
CoreContainer.Initializer init = new CoreContainer.Initializer() {
{
- this.dataDir = AbstractZooKeeperTestCase.this.dataDir
+ this.dataDir = AbstractZkTestCase.this.dataDir
.getAbsolutePath();
}
};
@@ -90,17 +90,17 @@
}
- final static String JUST_HOST_NAME =
AbstractZooKeeperTestCase.ZOO_KEEPER_HOST.substring(0,
- AbstractZooKeeperTestCase.ZOO_KEEPER_HOST.indexOf('/'));
+ final static String JUST_HOST_NAME =
AbstractZkTestCase.ZOO_KEEPER_HOST.substring(0,
+ AbstractZkTestCase.ZOO_KEEPER_HOST.indexOf('/'));
// static to share with distrib test
static void buildZooKeeper(String config, String schema)
throws Exception {
- SolrZkClient zkClient = new SolrZkClient(JUST_HOST_NAME,
AbstractZooKeeperTestCase.TIMEOUT);
+ SolrZkClient zkClient = new SolrZkClient(JUST_HOST_NAME,
AbstractZkTestCase.TIMEOUT);
zkClient.makePath("/solr");
zkClient.close();
- zkClient = new SolrZkClient(ZOO_KEEPER_HOST,
AbstractZooKeeperTestCase.TIMEOUT);
+ zkClient = new SolrZkClient(ZOO_KEEPER_HOST, AbstractZkTestCase.TIMEOUT);
zkClient.makePath("/collections/collection1/config=collection1");
@@ -130,9 +130,9 @@
private void printLayout() throws Exception {
SolrZkClient zkClient = new SolrZkClient(
- AbstractZooKeeperTestCase.ZOO_KEEPER_HOST.substring(0,
- AbstractZooKeeperTestCase.ZOO_KEEPER_HOST.indexOf('/')),
- AbstractZooKeeperTestCase.TIMEOUT);
+ AbstractZkTestCase.ZOO_KEEPER_HOST.substring(0,
+ AbstractZkTestCase.ZOO_KEEPER_HOST.indexOf('/')),
+ AbstractZkTestCase.TIMEOUT);
zkClient.printLayoutToStdOut();
zkClient.close();
}
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
(from r895087,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZooKeeperTest.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZooKeeperTest.java&r1=895087&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZooKeeperTest.java
(original)
+++
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
Sat Jan 2 19:45:25 2010
@@ -26,7 +26,7 @@
* nocommit:
*
*/
-public class BasicDistributedZooKeeperTest extends
AbstractDistributedZooKeeperTestCase {
+public class BasicDistributedZkTest extends AbstractDistributedZkTestCase {
@Override
public String getSchemaFile() {
return "schema.xml";
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZkTest.java
(from r894959,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZooKeeperTest.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZkTest.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZkTest.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZooKeeperTest.java&r1=894959&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZooKeeperTest.java
(original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicZkTest.java
Sat Jan 2 19:45:25 2010
@@ -25,7 +25,7 @@
* TODO: assert config came from ZooKeeper
*
*/
-public class BasicZooKeeperTest extends AbstractZooKeeperTestCase {
+public class BasicZkTest extends AbstractZkTestCase {
public void testBasic() throws Exception {
// test using ZooKeeper
assertTrue("Not using ZooKeeper", h.getCoreContainer().isZooKeeperAware());
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZkFailuresTest.java
(from r894959,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZooKeeperFailuresTest.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZkFailuresTest.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZkFailuresTest.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZooKeeperFailuresTest.java&r1=894959&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZooKeeperFailuresTest.java
(original)
+++
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/DistributedZkFailuresTest.java
Sat Jan 2 19:45:25 2010
@@ -25,7 +25,7 @@
* nocommit:
*
*/
-public class DistributedZooKeeperFailuresTest extends
AbstractDistributedZooKeeperTestCase {
+public class DistributedZkFailuresTest extends AbstractDistributedZkTestCase {
@Override
public String getSchemaFile() {
return "schema.xml";
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
(from r895265,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperControllerTest.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperControllerTest.java&r1=895265&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperControllerTest.java
(original)
+++
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
Sat Jan 2 19:45:25 2010
@@ -30,7 +30,7 @@
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
-public class ZooKeeperControllerTest extends TestCase {
+public class ZkControllerTest extends TestCase {
private static final String COLLECTION_NAME = "collection1";
@@ -54,10 +54,10 @@
public void testReadShards() throws Exception {
String zkDir = tmpDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
- ZooKeeperTestServer server = null;
+ ZkTestServer server = null;
SolrZkClient zkClient = null;
try {
- server = new ZooKeeperTestServer(zkDir);
+ server = new ZkTestServer(zkDir);
server.run();
makeSolrZkNode();
@@ -77,7 +77,7 @@
zkClient.printLayoutToStdOut();
}
- ZooKeeperController zkController = new
ZooKeeperController(ZOO_KEEPER_ADDRESS, "collection1", "localhost", "8983",
"/solr", TIMEOUT);
+ ZkController zkController = new ZkController(ZOO_KEEPER_ADDRESS,
"collection1", "localhost", "8983", "/solr", TIMEOUT);
Map<String,ShardInfoList> shardInfoMap =
zkController.readShardInfo(shardsPath);
assertTrue(shardInfoMap.size() > 0);
@@ -120,7 +120,7 @@
String zkDir = tmpDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
- ZooKeeperTestServer server = new ZooKeeperTestServer(zkDir);
+ ZkTestServer server = new ZkTestServer(zkDir);
server.run();
makeSolrZkNode();
@@ -135,7 +135,7 @@
zkClient.printLayoutToStdOut();
}
- ZooKeeperController zkController = new
ZooKeeperController(ZOO_KEEPER_ADDRESS, "collection1", "localhost", "8983",
"/solr", TIMEOUT);
+ ZkController zkController = new ZkController(ZOO_KEEPER_ADDRESS,
"collection1", "localhost", "8983", "/solr", TIMEOUT);
String configName = zkController.readConfigName(COLLECTION_NAME);
assertEquals(configName, actualConfigName);
@@ -152,10 +152,10 @@
Properties props = new Properties();
props.put(CollectionInfo.URL_PROP, url);
props.put(CollectionInfo.SHARD_LIST_PROP, shardList);
- props.store(baos, ZooKeeperController.PROPS_DESC);
+ props.store(baos, ZkController.PROPS_DESC);
zkClient.create(shardsPath
- + ZooKeeperController.NODE_ZKPREFIX, baos.toByteArray(),
CreateMode.EPHEMERAL_SEQUENTIAL, null);
+ + ZkController.NODE_ZKPREFIX, baos.toByteArray(),
CreateMode.EPHEMERAL_SEQUENTIAL, null);
}
private void makeSolrZkNode() throws Exception {
Copied:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java
(from r895087,
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperTestServer.java)
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java?p2=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java&p1=lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperTestServer.java&r1=895087&r2=895273&rev=895273&view=diff
==============================================================================
---
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZooKeeperTestServer.java
(original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java
Sat Jan 2 19:45:25 2010
@@ -20,7 +20,7 @@
import org.apache.zookeeper.server.ServerConfig;
import org.apache.zookeeper.server.ZooKeeperServerMain;
-public class ZooKeeperTestServer {
+public class ZkTestServer {
private static final int PORT = 2181;
protected ZKServerMain zkServer = new ZKServerMain();
@@ -33,7 +33,7 @@
}
}
- public ZooKeeperTestServer(String zkDir) {
+ public ZkTestServer(String zkDir) {
this.zkDir = zkDir;
}
