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/07/30 02:42:46 UTC

svn commit: r1366969 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java

Author: markrmiller
Date: Mon Jul 30 00:42:46 2012
New Revision: 1366969

URL: http://svn.apache.org/viewvc?rev=1366969&view=rev
Log:
fix the monkey: connection loss and expiration cause NPE

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java?rev=1366969&r1=1366968&r2=1366969&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java Mon Jul 30 00:42:46 2012
@@ -99,9 +99,9 @@ public class ChaosMonkey {
   public void expireRandomSession() throws KeeperException, InterruptedException {
     String sliceName = getRandomSlice();
     
-    JettySolrRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders).jetty;
+    CloudJettyRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders);
     if (jetty != null) {
-      expireSession(jetty);
+      expireSession(jetty.jetty);
       expires.incrementAndGet();
     }
   }
@@ -110,9 +110,9 @@ public class ChaosMonkey {
     monkeyLog("cause connection loss!");
     
     String sliceName = getRandomSlice();
-    JettySolrRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders).jetty;
+    CloudJettyRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders);
     if (jetty != null) {
-      causeConnectionLoss(jetty);
+      causeConnectionLoss(jetty.jetty);
       connloss.incrementAndGet();
     }
   }