You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/03/15 11:07:05 UTC
svn commit: r1666788 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/test-framework/
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Author: andyetitmoves
Date: Sun Mar 15 10:07:04 2015
New Revision: 1666788
URL: http://svn.apache.org/r1666788
Log:
SOLR-7246: Speed up BasicZkTest, TestManagedResourceStorage
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1666788&r1=1666787&r2=1666788&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun Mar 15 10:07:04 2015
@@ -264,6 +264,8 @@ Other Changes
* SOLR-7173: Fix ReplicationFactorTest on Windows by adding better retry
support after seeing no response exceptions. (Ishan Chattopadhyaya via Timothy Potter)
+* SOLR-7246: Speed up BasicZkTest, TestManagedResourceStorage (Ramkumar Aiyengar)
+
================== 5.0.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1666788&r1=1666787&r2=1666788&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Sun Mar 15 10:07:04 2015
@@ -55,6 +55,7 @@ import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.core.SolrXmlConfig;
+import org.apache.solr.core.ZkContainer;
import org.apache.solr.handler.UpdateRequestHandler;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
@@ -68,6 +69,7 @@ import org.apache.solr.util.AbstractSolr
import org.apache.solr.util.RevertDefaultThreadHandlerRule;
import org.apache.solr.util.SSLTestConfig;
import org.apache.solr.util.TestHarness;
+import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
@@ -686,7 +688,21 @@ public abstract class SolrTestCaseJ4 ext
*/
public static void deleteCore() {
log.info("###deleteCore" );
- if (h != null) { h.close(); }
+ if (h != null) {
+ // If the test case set up Zk, it should still have it as available,
+ // otherwise the core close will just be unnecessarily delayed.
+ CoreContainer cc = h.getCoreContainer();
+ if (! cc.getCores().isEmpty() && cc.isZooKeeperAware()) {
+ try {
+ cc.getZkController().getZkClient().exists("/", false);
+ } catch (KeeperException e) {
+ log.error("Testing connectivity to ZK by checking for root path failed", e);
+ fail("Trying to tear down a ZK aware core container with ZK not reachable");
+ } catch (InterruptedException ignored) {}
+ }
+
+ h.close();
+ }
if (factoryProp == null) {
System.clearProperty("solr.directoryFactory");
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1666788&r1=1666787&r2=1666788&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Sun Mar 15 10:07:04 2015
@@ -147,6 +147,8 @@ public abstract class AbstractZkTestCase
@AfterClass
public static void azt_afterClass() throws Exception {
+ deleteCore();
+
System.clearProperty("zkHost");
System.clearProperty("solr.test.sys.prop1");
System.clearProperty("solr.test.sys.prop2");