From b417a4c854e8905ecd61e98d9bb655640a893102 Mon Sep 17 00:00:00 2001 From: Wanqiang Ji Date: Mon, 10 Jun 2019 16:27:32 +0800 Subject: [PATCH] MAPREDUCE-7214. Remove unused pieces related to `mapreduce.job.userlog.retain.hours` Signed-off-by: Akira Ajisaka --- .../hadoop-common/src/site/markdown/DeprecatedProperties.md | 1 - .../src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java | 2 -- .../main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java | 2 -- .../src/test/resources/job_1329348432655_0001_conf.xml | 1 - hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json | 2 -- 5 files changed, 8 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md b/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md index abeacafa27..d693774c71 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md @@ -222,7 +222,6 @@ The following table lists the configuration property names that are deprecated i | mapreduce.reduce.class | mapreduce.job.reduce.class | | mapred.used.genericoptionsparser | mapreduce.client.genericoptionsparser.used | | mapred.userlog.limit.kb | mapreduce.task.userlog.limit.kb | -| mapred.userlog.retain.hours | mapreduce.job.userlog.retain.hours | | mapred.working.dir | mapreduce.job.working.dir | | mapred.work.output.dir | mapreduce.task.output.dir | | min.num.spills.for.combine | mapreduce.map.combine.minspills | diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java index fb346983c7..8fb6c9341a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java @@ -287,8 +287,6 @@ public interface MRJobConfig { @Deprecated public static final String CACHE_SYMLINK = "mapreduce.job.cache.symlink.create"; - public static final String USER_LOG_RETAIN_HOURS = "mapreduce.job.userlog.retain.hours"; - public static final String MAPREDUCE_JOB_USER_CLASSPATH_FIRST = "mapreduce.job.user.classpath.first"; public static final String MAPREDUCE_JOB_CLASSLOADER = "mapreduce.job.classloader"; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java index dcd3b08ab0..cf120342dd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java @@ -208,8 +208,6 @@ private static void addDeprecatedKeys() { MRJobConfig.TASK_OUTPUT_DIR), new DeprecationDelta("mapred.userlog.limit.kb", MRJobConfig.TASK_USERLOG_LIMIT), - new DeprecationDelta("mapred.userlog.retain.hours", - MRJobConfig.USER_LOG_RETAIN_HOURS), new DeprecationDelta("mapred.task.profile.params", MRJobConfig.TASK_PROFILE_PARAMS), new DeprecationDelta("io.sort.spill.percent", diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml index 45930f05f8..9659e45ec6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml @@ -229,7 +229,6 @@ mapreduce.job.ubertask.maxmaps9 yarn.nodemanager.heartbeat.interval-ms1000 dfs.namenode.secondary.http-address0.0.0.0:9868 -mapreduce.job.userlog.retain.hours24 mapreduce.task.timeout600000 mapreduce.jobhistory.loadedjobs.cache.size1 mapreduce.framework.nameyarn diff --git a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json index 7a52559f59..8c2e43e1e5 100644 --- a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json +++ b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json @@ -4809,7 +4809,6 @@ "mapreduce.job.ubertask.maxmaps" : "9", "yarn.scheduler.maximum-allocation-mb" : "8192", "yarn.nodemanager.heartbeat.interval-ms" : "1000", - "mapreduce.job.userlog.retain.hours" : "24", "dfs.namenode.secondary.http-address" : "0.0.0.0:9868", "mapreduce.task.timeout" : "600000", "mapreduce.framework.name" : "yarn", @@ -9877,7 +9876,6 @@ "mapreduce.job.ubertask.maxmaps" : "9", "yarn.scheduler.maximum-allocation-mb" : "8192", "yarn.nodemanager.heartbeat.interval-ms" : "1000", - "mapreduce.job.userlog.retain.hours" : "24", "dfs.namenode.secondary.http-address" : "0.0.0.0:9868", "mapreduce.task.timeout" : "600000", "mapreduce.framework.name" : "yarn",