diff --git hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
index e34518c..bd9c9c5 100644
--- hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
+++ hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
@@ -152,7 +152,6 @@
mapreduce.map.speculativefalse
mapreduce.job.acl-view-job
mapreduce.map.output.key.classorg.apache.hadoop.io.IntWritable
-yarn.ipc.serializer.typeprotocolbuffers
mapreduce.job.end-notification.max.retry.interval5
ftp.blocksize67108864
mapreduce.tasktracker.http.threads40
diff --git hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
index 230e4fd..59ae8d7 100644
--- hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
+++ 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",
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index a2c3fd0..e642d05 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -31,22 +31,11 @@
- Type of serialization to use.
- yarn.ipc.serializer.type
- protocolbuffers
-
-
-
Factory to create server IPC classes.
yarn.ipc.server.factory.class
- Factory to create IPC exceptions.
- yarn.ipc.exception.factory.class
-
-
-
Factory to create serializeable records.
yarn.ipc.record.factory.class
@@ -163,12 +152,6 @@
- How often should the RM check that the AM is still alive.
- yarn.resourcemanager.amliveliness-monitor.interval-ms
- 1000
-
-
-
Maximum time to wait to establish connection to
ResourceManager.
yarn.resourcemanager.connect.max-wait.ms
@@ -221,12 +204,6 @@
- How often to check that node managers are still alive.
- yarn.resourcemanager.nm.liveness-monitor.interval-ms
- 1000
-
-
-
Path to file with nodes to include.
yarn.resourcemanager.nodes.include-path
@@ -580,7 +557,7 @@
Interval for the roll over for the master key used to generate
application tokens
- yarn.resourcemanager.application-tokens.master-key-rolling-interval-secs
+ yarn.resourcemanager.am-rm-tokens.master-key-rolling-interval-secs
86400
@@ -1091,20 +1068,6 @@
- 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.
- yarn.nodemanager.resourcemanager.connect.wait.secs
- 900
-
-
-
- Time interval, in seconds, between each NM attempt to connect to RM.
- yarn.nodemanager.resourcemanager.connect.retry_interval.secs
- 30
-
-
-
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.