hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject git commit: YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw)
Date Fri, 19 Sep 2014 21:08:16 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 bdb864e5e -> 0037b8f67


YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0037b8f6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0037b8f6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0037b8f6

Branch: refs/heads/branch-2
Commit: 0037b8f67bd5327fced92686365e7264b3a61cd8
Parents: bdb864e
Author: Allen Wittenauer <aw@apache.org>
Authored: Fri Sep 19 14:08:04 2014 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Fri Sep 19 14:08:04 2014 -0700

----------------------------------------------------------------------
 .../resources/job_1329348432655_0001_conf.xml   |  1 -
 .../src/main/data/2jobs2min-rumen-jh.json       |  6 +--
 hadoop-yarn-project/CHANGES.txt                 |  3 ++
 .../src/main/resources/yarn-default.xml         | 39 +-------------------
 4 files changed, 6 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0037b8f6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
----------------------------------------------------------------------
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 0bff22c..0109e09 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
@@ -152,7 +152,6 @@
 <property><!--Loaded from job.xml--><name>mapreduce.map.speculative</name><value>false</value></property>
 <property><!--Loaded from job.xml--><name>mapreduce.job.acl-view-job</name><value>
</value></property>
 <property><!--Loaded from job.xml--><name>mapreduce.map.output.key.class</name><value>org.apache.hadoop.io.IntWritable</value></property>
-<property><!--Loaded from job.xml--><name>yarn.ipc.serializer.type</name><value>protocolbuffers</value></property>
 <property><!--Loaded from mapred-default.xml--><name>mapreduce.job.end-notification.max.retry.interval</name><value>5</value></property>
 <property><!--Loaded from job.xml--><name>ftp.blocksize</name><value>67108864</value></property>
 <property><!--Loaded from job.xml--><name>mapreduce.tasktracker.http.threads</name><value>40</value></property>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0037b8f6/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
----------------------------------------------------------------------
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 230e4fd..59ae8d7 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
@@ -4716,7 +4716,6 @@
     "dfs.journalnode.http-address" : "0.0.0.0:8480",
     "mapreduce.job.acl-view-job" : " ",
     "mapreduce.reduce.shuffle.retry-delay.max.ms" : "60000",
-    "yarn.ipc.serializer.type" : "protocolbuffers",
     "mapreduce.job.end-notification.max.retry.interval" : "5",
     "ftp.blocksize" : "67108864",
     "mapreduce.tasktracker.http.threads" : "80",
@@ -4841,7 +4840,7 @@
     "yarn.ipc.rpc.class" : "org.apache.hadoop.yarn.ipc.HadoopYarnProtoRPC",
     "mapreduce.job.name" : "TeraGen",
     "kfs.blocksize" : "67108864",
-    "yarn.resourcemanager.application-tokens.master-key-rolling-interval-secs" : "86400",
+    "yarn.resourcemanager.am-rm-tokens.master-key-rolling-interval-secs" : "86400",
     "mapreduce.job.ubertask.maxmaps" : "9",
     "yarn.scheduler.maximum-allocation-mb" : "8192",
     "yarn.nodemanager.heartbeat.interval-ms" : "1000",
@@ -9830,7 +9829,6 @@
     "dfs.journalnode.http-address" : "0.0.0.0:8480",
     "mapreduce.job.acl-view-job" : " ",
     "mapreduce.reduce.shuffle.retry-delay.max.ms" : "60000",
-    "yarn.ipc.serializer.type" : "protocolbuffers",
     "mapreduce.job.end-notification.max.retry.interval" : "5",
     "ftp.blocksize" : "67108864",
     "mapreduce.tasktracker.http.threads" : "80",
@@ -9955,7 +9953,7 @@
     "yarn.ipc.rpc.class" : "org.apache.hadoop.yarn.ipc.HadoopYarnProtoRPC",
     "mapreduce.job.name" : "TeraGen",
     "kfs.blocksize" : "67108864",
-    "yarn.resourcemanager.application-tokens.master-key-rolling-interval-secs" : "86400",
+    "yarn.resourcemanager.am-rm-tokens.master-key-rolling-interval-secs" : "86400",
     "mapreduce.job.ubertask.maxmaps" : "9",
     "yarn.scheduler.maximum-allocation-mb" : "8192",
     "yarn.nodemanager.heartbeat.interval-ms" : "1000",

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0037b8f6/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0a433fa..6c5d51f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -373,6 +373,9 @@ Release 2.6.0 - UNRELEASED
     YARN-2565. Fixed RM to not use FileSystemApplicationHistoryStore unless
     explicitly set. (Zhijie Shen via jianhe)
 
+    YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via
+    aw)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0037b8f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 6ea7c5d..2c9ca68 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -31,22 +31,11 @@
   </property>
 
   <property>
-    <description>Type of serialization to use.</description>
-    <name>yarn.ipc.serializer.type</name>
-    <value>protocolbuffers</value>
-  </property>
-
-  <property>
     <description>Factory to create server IPC classes.</description>
     <name>yarn.ipc.server.factory.class</name>
   </property>
 
   <property>
-    <description>Factory to create IPC exceptions.</description>
-    <name>yarn.ipc.exception.factory.class</name>
-  </property>
-
-  <property>
     <description>Factory to create serializeable records.</description>
     <name>yarn.ipc.record.factory.class</name>
   </property>
@@ -163,12 +152,6 @@
   </property>
 
   <property>
-    <description>How often should the RM check that the AM is still alive.</description>
-    <name>yarn.resourcemanager.amliveliness-monitor.interval-ms</name>
-    <value>1000</value>
-  </property>
-
-  <property>
     <description>Maximum time to wait to establish connection to
     ResourceManager.</description>
     <name>yarn.resourcemanager.connect.max-wait.ms</name>
@@ -221,12 +204,6 @@
   </property>
 
   <property>
-    <description>How often to check that node managers are still alive.</description>
-    <name>yarn.resourcemanager.nm.liveness-monitor.interval-ms</name>
-    <value>1000</value>
-  </property>
-
-  <property>
     <description>Path to file with nodes to include.</description>
     <name>yarn.resourcemanager.nodes.include-path</name>
     <value></value>
@@ -580,7 +557,7 @@
     <description>Interval for the roll over for the master key used to generate
         application tokens
     </description>
-    <name>yarn.resourcemanager.application-tokens.master-key-rolling-interval-secs</name>
+    <name>yarn.resourcemanager.am-rm-tokens.master-key-rolling-interval-secs</name>
     <value>86400</value>
   </property>
 
@@ -1090,20 +1067,6 @@
   </property>
 
   <property>
-    <description>Max time, in seconds, to wait to establish a connection to RM when
NM starts.
-    The NM will shutdown if it cannot connect to RM within the specified max time period.
-    If the value is set as -1, then NM will retry forever.</description>
-    <name>yarn.nodemanager.resourcemanager.connect.wait.secs</name>
-    <value>900</value>
-  </property>
-
-  <property>
-    <description>Time interval, in seconds, between each NM attempt to connect to RM.</description>
-    <name>yarn.nodemanager.resourcemanager.connect.retry_interval.secs</name>
-    <value>30</value>
-  </property>
-
-  <property>
     <description>The minimum allowed version of a resourcemanager that a nodemanager
will connect to.  
       The valid values are NONE (no version checking), EqualToNM (the resourcemanager's version
is 
       equal to or greater than the NM version), or a Version String.</description>


Mime
View raw message