Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10830 Integration test MR jobs attempt to load htrace jars from the wrong location 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1583826 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ndimiduk 2014-04-01 23:27:56 +00:00
parent 556f7fa07e
commit 62327bc08d
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java
View File

@ -123,11 +123,18 @@ public class IntegrationTestImportTsv implements Configurable, Tool {
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;
}

14
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
View File

@ -1024,10 +1024,22 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
@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>

9
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
View File

@ -127,9 +127,18 @@ public class IntegrationTestLoadAndVerify extends IntegrationTestBase {
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