svn commit: r1535204 - in /lucene/dev/trunk/solr: core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

[ma...@apache.org]

Author: markrmiller
Date: Wed Oct 23 22:37:47 2013
New Revision: 1535204

URL: http://svn.apache.org/r1535204
Log:
SOLR-5384: randomlyEnableAutoSoftCommit in ChaosMonkeySafeLeaderTest is buggy.

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1535204&r1=1535203&r2=1535204&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java Wed Oct 23 22:37:47 2013
@@ -25,9 +25,6 @@ import org.apache.solr.client.solrj.Solr
 import org.apache.solr.client.solrj.impl.CloudSolrServer;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.core.Diagnostics;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.servlet.SolrDispatchFilter;
-import org.apache.solr.update.DirectUpdateHandler2;
 import org.apache.solr.update.SolrCmdDistributor;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -35,7 +32,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 
 @Slow
-public class  ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase {
+public class ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase {
   
   private static final Integer RUN_LENGTH = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1"));
 
@@ -89,7 +86,7 @@ public class  ChaosMonkeySafeLeaderTest 
     handle.put("QTime", SKIPVAL);
     handle.put("timestamp", SKIPVAL);
     
-    // randomly turn on 5 seconds 'soft' commit
+    // randomly turn on 1 seconds 'soft' commit
     randomlyEnableAutoSoftCommit();
 
     del("*:*");
@@ -164,17 +161,7 @@ public class  ChaosMonkeySafeLeaderTest 
 
   private void randomlyEnableAutoSoftCommit() {
     if (r.nextBoolean()) {
-      log.info("Turning on auto soft commit");
-      for (CloudJettyRunner jetty : shardToJetty.get("shard1")) {
-        SolrCore core = ((SolrDispatchFilter) jetty.jetty.getDispatchFilter()
-            .getFilter()).getCores().getCore("collection1");
-        try {
-          ((DirectUpdateHandler2) core.getUpdateHandler()).getCommitTracker()
-              .setTimeUpperBound(5000);
-        } finally {
-          core.close();
-        }
-      }
+      enableAutoSoftCommit(1000);
     } else {
       log.info("Not turning on auto soft commit");
     }

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1535204&r1=1535203&r2=1535204&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Wed Oct 23 22:37:47 2013
@@ -46,7 +46,11 @@ import org.apache.solr.common.params.Col
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.SolrCore;
 import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.servlet.SolrDispatchFilter;
+import org.apache.solr.update.DirectUpdateHandler2;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -1056,6 +1060,20 @@ public abstract class AbstractFullDistri
     }
   }
   
+  protected void enableAutoSoftCommit(int time) {
+    log.info("Turning on auto soft commit: " + time);
+    for (List<CloudJettyRunner> jettyList : shardToJetty.values()) {
+      for (CloudJettyRunner jetty : jettyList) {
+        CoreContainer cores = ((SolrDispatchFilter) jetty.jetty
+            .getDispatchFilter().getFilter()).getCores();
+        for (SolrCore core : cores.getCores()) {
+          ((DirectUpdateHandler2) core.getUpdateHandler())
+              .getSoftCommitTracker().setTimeUpperBound(time);
+        }
+      }
+    }
+  }
+  
   private String toStr(SolrDocumentList lst, int maxSz) {
     if (lst.size() <= maxSz) return lst.toString();