big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-14717. [Dynamometer] Remove explicit search for JUnit dependency JAR from Dynamometer Client as it is packaged in the primary JAR. Contributed by Kevin Su.

Browse Source
This commit is contained in:
Erik Krogen 2019-08-13 08:52:59 -07:00
parent e9b6b81de4
commit 274966e675
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
View File

@ -97,7 +97,6 @@
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.util.Records;
import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -253,10 +252,7 @@ public class Client extends Configured implements Tool {
*/
public static void main(String[] args) throws Exception {
Client client = new Client(
ClassUtil.findContainingJar(ApplicationMaster.class),
// JUnit is required by MiniDFSCluster at runtime, but is not included
// in standard Hadoop dependencies, so it must explicitly included here
ClassUtil.findContainingJar(Assert.class));
ClassUtil.findContainingJar(ApplicationMaster.class));
System.exit(ToolRunner.run(new YarnConfiguration(), client, args));
}

2
hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
View File

@ -122,7 +122,7 @@ public class TestDynamometerInfra {
private static final String HADOOP_BIN_PATH_KEY = "dyno.hadoop.bin.path";
private static final String HADOOP_BIN_VERSION_KEY =
"dyno.hadoop.bin.version";
private static final String HADOOP_BIN_VERSION_DEFAULT = "3.1.1";
private static final String HADOOP_BIN_VERSION_DEFAULT = "3.1.2";
private static final String FSIMAGE_FILENAME = "fsimage_0000000000000061740";
private static final String VERSION_FILENAME = "VERSION";