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

audit clearing sys props 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1296855 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-03-04 18:52:20 +00:00
parent 36126c9b1f
commit 726ac1883a
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,8 @@ import java.util.Map;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCmdExecutor;
import org.apache.solr.common.cloud.ZkNodeProps; import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.SolrConfig;
import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.CreateMode;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -61,7 +59,7 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
System.setProperty("solrcloud.skip.autorecovery", "true"); System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("zkHost", zkServer.getZkAddress()); System.setProperty("zkHost", zkServer.getZkAddress());
System.setProperty("hostPort", "0000"); System.setProperty("jetty.port", "0000");
buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(), buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(),
"solrconfig.xml", "schema.xml"); "solrconfig.xml", "schema.xml");
@ -120,6 +118,8 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
System.clearProperty("solr.test.sys.prop1"); System.clearProperty("solr.test.sys.prop1");
System.clearProperty("solr.test.sys.prop2"); System.clearProperty("solr.test.sys.prop2");
System.clearProperty("solrcloud.skip.autorecovery"); System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty("jetty.port");
zkServer.shutdown(); zkServer.shutdown();
// wait just a bit for any zk client threads to outlast timeout // wait just a bit for any zk client threads to outlast timeout

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

@ -271,6 +271,11 @@ public class LeaderElectionIntegrationTest extends SolrTestCaseJ4 {
@AfterClass @AfterClass
public static void afterClass() throws InterruptedException { public static void afterClass() throws InterruptedException {
System.clearProperty("solrcloud.skip.autorecovery"); System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty("zkClientTimeout");
System.clearProperty("zkHost");
System.clearProperty("shard");
System.clearProperty("solr.data.dir");
System.clearProperty("solr.solr.home");
resetExceptionIgnores(); resetExceptionIgnores();
// wait just a bit for any zk client threads to outlast timeout // wait just a bit for any zk client threads to outlast timeout
Thread.sleep(2000); Thread.sleep(2000);

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

@ -98,7 +98,7 @@ public class NodeStateWatcherTest extends SolrTestCaseJ4 {
waitForCall(4, callCounter); waitForCall(4, callCounter);
assertEquals(0, watcher.getCurrentState().size()); assertEquals(0, watcher.getCurrentState().size());
} finally { } finally {
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
if (zkClient != null) { if (zkClient != null) {
zkClient.close(); zkClient.close();
} }

8
solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
View File

@ -237,6 +237,8 @@ public class OverseerTest extends SolrTestCaseJ4 {
assertNotNull(reader.getLeaderUrl("collection1", "shard3", 15000)); assertNotNull(reader.getLeaderUrl("collection1", "shard3", 15000));
} finally { } finally {
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
System.clearProperty("bootstrap_confdir");
if (DEBUG) { if (DEBUG) {
if (zkController != null) { if (zkController != null) {
zkClient.printLayoutToStdOut(); zkClient.printLayoutToStdOut();
@ -250,8 +252,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
} }
server.shutdown(); server.shutdown();
} }
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
} }
@Test @Test
@ -394,6 +394,8 @@ public class OverseerTest extends SolrTestCaseJ4 {
} }
} finally { } finally {
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
System.clearProperty("bootstrap_confdir");
if (DEBUG) { if (DEBUG) {
if (controllers[0] != null) { if (controllers[0] != null) {
zkClient.printLayoutToStdOut(); zkClient.printLayoutToStdOut();
@ -414,8 +416,6 @@ public class OverseerTest extends SolrTestCaseJ4 {
nodeExecutors[i].shutdownNow(); nodeExecutors[i].shutdownNow();
} }
} }
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
} }
//wait until collections are available //wait until collections are available