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

MAPREDUCE-3775. Change MiniYarnCluster to escape special chars in testname. (Hitesh Shah via mahadev) - Merging r1240603 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240604 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mahadev Konar 2012-02-04 20:21:42 +00:00
parent 9bcf930433
commit aaa17aa6ab
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -654,6 +654,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3759. ClassCastException thrown in -list-active-trackers when MAPREDUCE-3759. ClassCastException thrown in -list-active-trackers when
there are a few unhealthy nodes (vinodkv via mahadev) there are a few unhealthy nodes (vinodkv via mahadev)
MAPREDUCE-3775. Change MiniYarnCluster to escape special chars in testname.
(Hitesh Shah via mahadev)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClientCluster.java
View File

@ -49,6 +49,9 @@ public class TestMiniMRClientCluster {
private static Path[] inFiles = new Path[5]; private static Path[] inFiles = new Path[5];
private static MiniMRClientCluster mrCluster; private static MiniMRClientCluster mrCluster;
private class InternalClass {
}
@BeforeClass @BeforeClass
public static void setup() throws IOException { public static void setup() throws IOException {
final Configuration conf = new Configuration(); final Configuration conf = new Configuration();
@ -73,7 +76,7 @@ public class TestMiniMRClientCluster {
// create the mini cluster to be used for the tests // create the mini cluster to be used for the tests
mrCluster = MiniMRClientClusterFactory.create( mrCluster = MiniMRClientClusterFactory.create(
TestMiniMRClientCluster.class, 1, new Configuration()); InternalClass.class, 1, new Configuration());
} }
@AfterClass @AfterClass

6
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
View File

@ -81,11 +81,11 @@ public class MiniYARNCluster extends CompositeService {
*/ */
public MiniYARNCluster(String testName, int noOfNodeManagers, public MiniYARNCluster(String testName, int noOfNodeManagers,
int numLocalDirs, int numLogDirs) { int numLocalDirs, int numLogDirs) {
super(testName.replace("$", ""));
super(testName);
this.numLocalDirs = numLocalDirs; this.numLocalDirs = numLocalDirs;
this.numLogDirs = numLogDirs; this.numLogDirs = numLogDirs;
this.testWorkDir = new File("target", testName); this.testWorkDir = new File("target",
testName.replace("$", ""));
try { try {
FileContext.getLocalFSFileContext().delete( FileContext.getLocalFSFileContext().delete(
new Path(testWorkDir.getAbsolutePath()), true); new Path(testWorkDir.getAbsolutePath()), true);