From 94d1eaa01e0225b214192b6ab0f2dcbefa29f7f4 Mon Sep 17 00:00:00 2001 From: Erik Krogen Date: Mon, 23 Apr 2018 11:07:13 -0700 Subject: [PATCH 1/2] Fix test failures by bumping default Hadoop version to 2.7.6. --- .../java/com/linkedin/dynamometer/TestDynamometerInfra.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java b/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java index df291798e1..9af5656e64 100644 --- a/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java +++ b/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java @@ -86,7 +86,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 = "2.7.5"; + private static final String HADOOP_BIN_VERSION_DEFAULT = "2.7.6"; private static final String FSIMAGE_FILENAME = "fsimage_0000000000000061740"; private static final String VERSION_FILENAME = "VERSION"; From 23e130077562b69873d3a5bbf309fd33a5445946 Mon Sep 17 00:00:00 2001 From: Erik Krogen Date: Mon, 23 Apr 2018 12:20:31 -0700 Subject: [PATCH 2/2] follow-on to fix the Javadoc and also update the travis YML --- .travis.yml | 2 +- .../java/com/linkedin/dynamometer/TestDynamometerInfra.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e67cbf5a82..f516de0749 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ git: jdk: - oraclejdk8 env: - - HADOOP_VERSION=2.7.5 + - HADOOP_VERSION=2.7.6 - HADOOP_VERSION=2.8.3 script: "./gradlew test --stacktrace --info -Ddyno.hadoop.bin.version=${HADOOP_VERSION}" diff --git a/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java b/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java index 9af5656e64..22da18dedc 100644 --- a/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java +++ b/dynamometer-infra/src/test/java/com/linkedin/dynamometer/TestDynamometerInfra.java @@ -65,8 +65,8 @@ * being available ({@code truncate} is generally required to run Dynamometer). * * You can optionally specify which version of HDFS should be started within - * the Dynamometer cluster; the default is 2.7.5. This can be adjusted by setting - * the {@value HADOOP_BIN_VERSION_KEY} property. This will automatically download + * the Dynamometer cluster; the default is {@value HADOOP_BIN_VERSION_DEFAULT}. This can be adjusted + * by setting the {@value HADOOP_BIN_VERSION_KEY} property. This will automatically download * the correct Hadoop tarball for the specified version. It downloads from an Apache * mirror (by default {@value DynoInfraUtils#APACHE_DOWNLOAD_MIRROR_DEFAULT}); which mirror * is used can be controlled with the {@value DynoInfraUtils#APACHE_DOWNLOAD_MIRROR_KEY}