svn commit: r1583826 - in /hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase: mapreduce/IntegrationTestImportTsv.java test/IntegrationTestBigLinkedList.java test/IntegrationTestLoadAndVerify.java

[nd...@apache.org]

Author: ndimiduk
Date: Tue Apr  1 23:27:56 2014
New Revision: 1583826

URL: http://svn.apache.org/r1583826
Log:
HBASE-10830 Integration test MR jobs attempt to load htrace jars from the wrong location

Modified:
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java?rev=1583826&r1=1583825&r2=1583826&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java (original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java Tue Apr  1 23:27:56 2014
@@ -123,11 +123,18 @@ public class IntegrationTestImportTsv im
       util = new IntegrationTestingUtility();
     }
     util.initializeCluster(1);
+    if (!util.isDistributedCluster()) {
+      // also need MR when running without a real cluster
+      util.startMiniMapReduceCluster();
+    }
   }
 
   @AfterClass
   public static void releaseCluster() throws Exception {
     util.restoreCluster();
+    if (!util.isDistributedCluster()) {
+      util.shutdownMiniMapReduceCluster();
+    }
     util = null;
   }
 

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1583826&r1=1583825&r2=1583826&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java (original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java Tue Apr  1 23:27:56 2014
@@ -1024,10 +1024,22 @@ public class IntegrationTestBigLinkedLis
   @Override
   public void setUpCluster() throws Exception {
     util = getTestingUtil(getConf());
-    util.initializeCluster(util.isDistributedCluster() ? 1 : this.NUM_SLAVES_BASE);
+    boolean isDistributed = util.isDistributedCluster();
+    util.initializeCluster(isDistributed ? 1 : this.NUM_SLAVES_BASE);
+    if (!isDistributed) {
+      util.startMiniMapReduceCluster();
+    }
     this.setConf(util.getConfiguration());
   }
 
+  @Override
+  public void cleanUpCluster() throws Exception {
+    super.cleanUpCluster();
+    if (util.isDistributedCluster()) {
+      util.shutdownMiniMapReduceCluster();
+    }
+  }
+
   @Test
   public void testContinuousIngest() throws IOException, Exception {
     //Loop <num iterations> <num mappers> <num nodes per mapper> <output dir> <num reducers>

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java?rev=1583826&r1=1583825&r2=1583826&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java (original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java Tue Apr  1 23:27:56 2014
@@ -127,9 +127,18 @@ public class IntegrationTestLoadAndVerif
       getConf().setLong(NUM_TO_WRITE_KEY, NUM_TO_WRITE_DEFAULT / 100);
       getConf().setInt(NUM_MAP_TASKS_KEY, NUM_MAP_TASKS_DEFAULT / 100);
       getConf().setInt(NUM_REDUCE_TASKS_KEY, NUM_REDUCE_TASKS_DEFAULT / 10);
+      util.startMiniMapReduceCluster();
     }
   }
 
+@Override
+public void cleanUpCluster() throws Exception {
+  super.cleanUpCluster();
+  if (!util.isDistributedCluster()) {
+    util.shutdownMiniMapReduceCluster();
+  }
+}
+
   /**
    * Converts a "long" value between endian systems.
    * Borrowed from Apache Commons IO