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/03/04 19:52:20 UTC
svn commit: r1296855 - in
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud:
AbstractZkTestCase.java LeaderElectionIntegrationTest.java
NodeStateWatcherTest.java OverseerTest.java
Author: markrmiller
Date: Sun Mar 4 18:52:20 2012
New Revision: 1296855
URL: http://svn.apache.org/viewvc?rev=1296855&view=rev
Log:
audit clearing sys props
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/NodeStateWatcherTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1296855&r1=1296854&r2=1296855&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java Sun Mar 4 18:52:20 2012
@@ -24,10 +24,8 @@ import java.util.Map;
import org.apache.solr.SolrTestCaseJ4;
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.ZkStateReader;
-import org.apache.solr.core.SolrConfig;
import org.apache.zookeeper.CreateMode;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -61,7 +59,7 @@ public abstract class AbstractZkTestCase
System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("zkHost", zkServer.getZkAddress());
- System.setProperty("hostPort", "0000");
+ System.setProperty("jetty.port", "0000");
buildZooKeeper(zkServer.getZkHost(), zkServer.getZkAddress(),
"solrconfig.xml", "schema.xml");
@@ -120,6 +118,8 @@ public abstract class AbstractZkTestCase
System.clearProperty("solr.test.sys.prop1");
System.clearProperty("solr.test.sys.prop2");
System.clearProperty("solrcloud.skip.autorecovery");
+ System.clearProperty("jetty.port");
+
zkServer.shutdown();
// wait just a bit for any zk client threads to outlast timeout
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1296855&r1=1296854&r2=1296855&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Sun Mar 4 18:52:20 2012
@@ -271,6 +271,11 @@ public class LeaderElectionIntegrationTe
@AfterClass
public static void afterClass() throws InterruptedException {
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();
// wait just a bit for any zk client threads to outlast timeout
Thread.sleep(2000);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/NodeStateWatcherTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/NodeStateWatcherTest.java?rev=1296855&r1=1296854&r2=1296855&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/NodeStateWatcherTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/NodeStateWatcherTest.java Sun Mar 4 18:52:20 2012
@@ -98,7 +98,7 @@ public class NodeStateWatcherTest extend
waitForCall(4, callCounter);
assertEquals(0, watcher.getCurrentState().size());
} finally {
-
+ System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
if (zkClient != null) {
zkClient.close();
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1296855&r1=1296854&r2=1296855&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Sun Mar 4 18:52:20 2012
@@ -237,6 +237,8 @@ public class OverseerTest extends SolrTe
assertNotNull(reader.getLeaderUrl("collection1", "shard3", 15000));
} finally {
+ System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
+ System.clearProperty("bootstrap_confdir");
if (DEBUG) {
if (zkController != null) {
zkClient.printLayoutToStdOut();
@@ -250,8 +252,6 @@ public class OverseerTest extends SolrTe
}
server.shutdown();
}
-
- System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
}
@Test
@@ -394,6 +394,8 @@ public class OverseerTest extends SolrTe
}
} finally {
+ System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
+ System.clearProperty("bootstrap_confdir");
if (DEBUG) {
if (controllers[0] != null) {
zkClient.printLayoutToStdOut();
@@ -414,8 +416,6 @@ public class OverseerTest extends SolrTe
nodeExecutors[i].shutdownNow();
}
}
-
- System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
}
//wait until collections are available