You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ma...@apache.org on 2010/01/20 20:18:33 UTC
svn commit: r901338 -
/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
Author: markrmiller
Date: Wed Jan 20 19:18:33 2010
New Revision: 901338
URL: http://svn.apache.org/viewvc?rev=901338&view=rev
Log:
clean up test
Modified:
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=901338&r1=901337&r2=901338&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java Wed Jan 20 19:18:33 2010
@@ -111,7 +111,7 @@
assertEquals("master", props.get(ZkController.ROLE_PROP));
assertEquals(URL2, props.get(ZkController.URL_PROP));
assertEquals(TEST_NODE_NAME, props.get(ZkController.NODE_NAME));
-
+
props = shards.get(SHARD3);
assertEquals("slave", props.get(ZkController.ROLE_PROP));
assertEquals(URL3, props.get(ZkController.URL_PROP));
@@ -139,30 +139,34 @@
+ "zookeeper/server1/data";
ZkTestServer server = new ZkTestServer(zkDir);
- server.run();
+ try {
+ server.run();
- AbstractZkTestCase.makeSolrZkNode();
+ AbstractZkTestCase.makeSolrZkNode();
- SolrZkClient zkClient = new SolrZkClient(ZOO_KEEPER_ADDRESS, TIMEOUT);
- String actualConfigName = "firstConfig";
+ SolrZkClient zkClient = new SolrZkClient(ZOO_KEEPER_ADDRESS, TIMEOUT);
+ String actualConfigName = "firstConfig";
- String shardsPath = "/collections/" + COLLECTION_NAME + "/config="
- + actualConfigName;
- zkClient.makePath(shardsPath);
+ String shardsPath = "/collections/" + COLLECTION_NAME + "/config="
+ + actualConfigName;
+ zkClient.makePath(shardsPath);
- if (DEBUG) {
- zkClient.printLayoutToStdOut();
- }
+ if (DEBUG) {
+ zkClient.printLayoutToStdOut();
+ }
+ zkClient.close();
+ ZkController zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT,
+ "localhost", "8983", "/solr");
+ try {
+ String configName = zkController.readConfigName(COLLECTION_NAME);
+ assertEquals(configName, actualConfigName);
+ } finally {
+ zkController.close();
+ }
+ } finally {
- ZkController zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT,
- "localhost", "8983", "/solr");
- String configName = zkController.readConfigName(COLLECTION_NAME);
- assertEquals(configName, actualConfigName);
-
- // nocommit : close in finally
- zkController.close();
- zkClient.close();
- server.shutdown();
+ server.shutdown();
+ }
}
@@ -171,23 +175,28 @@
+ "zookeeper/server1/data";
ZkTestServer server = new ZkTestServer(zkDir);
- server.run();
+ ZkController zkController = null;
+ try {
+ server.run();
- AbstractZkTestCase.makeSolrZkNode();
+ AbstractZkTestCase.makeSolrZkNode();
- ZkController zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT,
- "localhost", "8983", "/solr");
+ zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost",
+ "8983", "/solr");
- zkController.uploadDirToCloud(new File("solr/conf"),
- ZkController.CONFIGS_ZKNODE + "/config1");
+ zkController.uploadDirToCloud(new File("solr/conf"),
+ ZkController.CONFIGS_ZKNODE + "/config1");
- if (DEBUG) {
- zkController.printLayoutToStdOut();
- }
+ if (DEBUG) {
+ zkController.printLayoutToStdOut();
+ }
- // nocommit close in finally
- zkController.close();
- server.shutdown();
+ } finally {
+ if (zkController != null) {
+ zkController.close();
+ }
+ server.shutdown();
+ }
}
@@ -202,8 +211,8 @@
byte[] bytes = props.store();
System.out.println("shards path:" + shardsPath);
- zkClient.create(shardsPath + "/" + zkNodeName, bytes,
- CreateMode.PERSISTENT);
+ zkClient
+ .create(shardsPath + "/" + zkNodeName, bytes, CreateMode.PERSISTENT);
}
}