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 2014/03/19 04:54:05 UTC
svn commit: r1579127 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
Author: markrmiller
Date: Wed Mar 19 03:54:05 2014
New Revision: 1579127
URL: http://svn.apache.org/r1579127
Log:
tests: cancel Timer
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java?rev=1579127&r1=1579126&r2=1579127&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java Wed Mar 19 03:54:05 2014
@@ -100,28 +100,34 @@ public class StressHdfsTest extends Basi
}
if (testRestartIntoSafeMode) {
- createCollection(DELETE_DATA_DIR_COLLECTION, 1, 1, 1);
-
- waitForRecoveriesToFinish(DELETE_DATA_DIR_COLLECTION, false);
-
- ChaosMonkey.stop(jettys.get(0));
-
- // enter safe mode and restart a node
- NameNodeAdapter.enterSafeMode(dfsCluster.getNameNode(), false);
-
- int rnd = LuceneTestCase.random().nextInt(10000);
Timer timer = new Timer();
- timer.schedule(new TimerTask() {
-
- @Override
- public void run() {
- NameNodeAdapter.leaveSafeMode(dfsCluster.getNameNode());
- }
- }, rnd);
-
- ChaosMonkey.start(jettys.get(0));
- waitForRecoveriesToFinish(DELETE_DATA_DIR_COLLECTION, false);
+ try {
+ createCollection(DELETE_DATA_DIR_COLLECTION, 1, 1, 1);
+
+ waitForRecoveriesToFinish(DELETE_DATA_DIR_COLLECTION, false);
+
+ ChaosMonkey.stop(jettys.get(0));
+
+ // enter safe mode and restart a node
+ NameNodeAdapter.enterSafeMode(dfsCluster.getNameNode(), false);
+
+ int rnd = LuceneTestCase.random().nextInt(10000);
+
+ timer.schedule(new TimerTask() {
+
+ @Override
+ public void run() {
+ NameNodeAdapter.leaveSafeMode(dfsCluster.getNameNode());
+ }
+ }, rnd);
+
+ ChaosMonkey.start(jettys.get(0));
+
+ waitForRecoveriesToFinish(DELETE_DATA_DIR_COLLECTION, false);
+ } finally {
+ timer.cancel();
+ }
}
}