From b668458e41e236e704b704900fb30131c575e98a Mon Sep 17 00:00:00 2001 From: Takanobu Asanuma Date: Wed, 18 Nov 2020 11:23:27 +0900 Subject: [PATCH 1/4] HADOOP-17375. Use archive.apache.org to fix the error of TestDynamometerInfra. --- .../org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java index ee0810d6439d7..aef612ea9cbb6 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java @@ -74,9 +74,9 @@ private DynoInfraUtils() {} public static final String APACHE_DOWNLOAD_MIRROR_KEY = DYNO_CONF_PREFIX + "apache-mirror"; - // Set a generic mirror as the default. + // Set archive.apache.org as the default. public static final String APACHE_DOWNLOAD_MIRROR_DEFAULT = - "http://mirrors.ocf.berkeley.edu/apache/"; + "http://archive.apache.org/dist/"; private static final String APACHE_DOWNLOAD_MIRROR_SUFFIX_FORMAT = "hadoop/common/hadoop-%s/hadoop-%s.tar.gz"; public static final String HADOOP_TAR_FILENAME_FORMAT = "hadoop-%s.tar.gz"; From 9bce480009e7438d5303e1ced727575ea049559f Mon Sep 17 00:00:00 2001 From: Takanobu Asanuma Date: Thu, 6 May 2021 19:58:14 +0900 Subject: [PATCH 2/4] revert the first change --- .../org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java index aef612ea9cbb6..ee0810d6439d7 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java @@ -74,9 +74,9 @@ private DynoInfraUtils() {} public static final String APACHE_DOWNLOAD_MIRROR_KEY = DYNO_CONF_PREFIX + "apache-mirror"; - // Set archive.apache.org as the default. + // Set a generic mirror as the default. public static final String APACHE_DOWNLOAD_MIRROR_DEFAULT = - "http://archive.apache.org/dist/"; + "http://mirrors.ocf.berkeley.edu/apache/"; private static final String APACHE_DOWNLOAD_MIRROR_SUFFIX_FORMAT = "hadoop/common/hadoop-%s/hadoop-%s.tar.gz"; public static final String HADOOP_TAR_FILENAME_FORMAT = "hadoop-%s.tar.gz"; From 701fbcd0134e579cf03c559646894b45f11735c9 Mon Sep 17 00:00:00 2001 From: Takanobu Asanuma Date: Thu, 6 May 2021 20:30:45 +0900 Subject: [PATCH 3/4] use hadoop 3.1.4 --- .../apache/hadoop/tools/dynamometer/TestDynamometerInfra.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java index 174d9cc039e03..092a54b78aaad 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java @@ -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.3"; + private static final String HADOOP_BIN_VERSION_DEFAULT = "3.1.4"; private static final String FSIMAGE_FILENAME = "fsimage_0000000000000061740"; private static final String VERSION_FILENAME = "VERSION"; From 839fed97be695a6b5e6cda9d9ee70c6908a0962b Mon Sep 17 00:00:00 2001 From: Takanobu Asanuma Date: Thu, 6 May 2021 23:06:08 +0900 Subject: [PATCH 4/4] implement an old API to AllowAllImpersonationProvider --- .../tools/dynamometer/AllowAllImpersonationProvider.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java index 6800bbe0ef814..14f52ac2b28a2 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java @@ -38,4 +38,9 @@ public void authorize(UserGroupInformation user, InetAddress remoteAddress) { // Do nothing } + // Although this API was removed from the interface by HADOOP-17367, we need + // to keep it here because TestDynamometerInfra uses an old hadoop binary. + public void authorize(UserGroupInformation user, String remoteAddress) { + // Do nothing + } }