hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject [hadoop] branch trunk updated: MAPREDUCE-7214. Remove unused pieces related to `mapreduce.job.userlog.retain.hours`
Date Tue, 11 Jun 2019 09:40:59 GMT
This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b417a4c  MAPREDUCE-7214. Remove unused pieces related to `mapreduce.job.userlog.retain.hours`
b417a4c is described below

commit b417a4c854e8905ecd61e98d9bb655640a893102
Author: Wanqiang Ji <wanqiang.ji@gmail.com>
AuthorDate: Mon Jun 10 16:27:32 2019 +0800

    MAPREDUCE-7214. Remove unused pieces related to `mapreduce.job.userlog.retain.hours`
    
    Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
---
 .../hadoop-common/src/site/markdown/DeprecatedProperties.md             | 1 -
 .../src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java          | 2 --
 .../src/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 abeacaf..d693774 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 fb34698..8fb6c93 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 dcd3b08..cf12034 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 @@ public class ConfigUtil {
         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 45930f0..9659e45 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 @@
 <property><!--Loaded from job.xml--><name>mapreduce.job.ubertask.maxmaps</name><value>9</value></property>
 <property><!--Loaded from job.xml--><name>yarn.nodemanager.heartbeat.interval-ms</name><value>1000</value></property>
 <property><!--Loaded from job.xml--><name>dfs.namenode.secondary.http-address</name><value>0.0.0.0:9868</value></property>
-<property><!--Loaded from job.xml--><name>mapreduce.job.userlog.retain.hours</name><value>24</value></property>
 <property><!--Loaded from job.xml--><name>mapreduce.task.timeout</name><value>600000</value></property>
 <property><!--Loaded from job.xml--><name>mapreduce.jobhistory.loadedjobs.cache.size</name><value>1</value></property>
 <property><!--Loaded from job.xml--><name>mapreduce.framework.name</name><value>yarn</value></property>
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 7a52559..8c2e43e 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",


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message