修改新的yarn配置

yili-conf/cluster/conf/hive-site.xml

@@ -1,285 +1,405 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration>
-
-    <property>
-        <name>datanucleus.schema.autoCreateTables</name>
-        <value>true</value>
-    </property>
-
-    <property>
-        <name>hbase.zookeeper.quorum</name>
-        <value>10.254.20.14:2181</value>
-    </property>
-
-    <property>
-        <name>hive.async.log.enabled</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.downloaded.resources.dir</name>
-        <value>/data/emr/hive/tmp/${hive.session.id}_resources</value>
-    </property>
-
-    <property>
-        <name>hive.exec.local.scratchdir</name>
-        <value>/data/emr/hive/tmp</value>
-    </property>
-
-    <property>
-        <name>hive.execution.engine</name>
-        <value>tez</value>
-    </property>
-
-    <property>
-        <name>hive.hwi.listen.host</name>
-        <value>0.0.0.0</value>
-    </property>
-
-    <property>
-        <name>hive.hwi.listen.port</name>
-        <value>7002</value>
-    </property>
-
-    <property>
-        <name>hive.llap.daemon.output.service.port</name>
-        <value>7009</value>
-    </property>
-
-    <property>
-        <name>hive.llap.daemon.rpc.port</name>
-        <value>7007</value>
-    </property>
-
-    <property>
-        <name>hive.llap.daemon.web.port</name>
-        <value>7008</value>
-    </property>
-
-    <property>
-        <name>hive.llap.daemon.yarn.shuffle.port</name>
-        <value>7006</value>
-    </property>
-
-    <property>
-        <name>hive.llap.management.rpc.port</name>
-        <value>7005</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.alter.notifications.basic</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.db.encoding</name>
-        <value>UTF-8</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.dml.events</name>
-        <value>true</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.event.db.listener.timetolive</name>
-        <value>172800s</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.event.db.notification.api.auth</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.kerberos.keytab.file</name>
-        <value>/var/krb5kdc/emr.keytab</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.kerberos.principal</name>
-        <value>hadoop/_HOST@EMR-7A4Z5V49</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.metrics.enabled</name>
-        <value>true</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.notifications.add.thrift.objects</name>
-        <value>true</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.port</name>
-        <value>7004</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.sasl.enabled</name>
-        <value>true</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.schema.verification</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.schema.verification.record.version</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.server.max.message.size</name>
-        <value>858993459</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.transactional.event.listeners</name>
-        <value>org.apache.hive.hcatalog.listener.DbNotificationListener</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.uris</name>
-        <value>thrift://10.254.20.13:7004</value>
-    </property>
-
-    <property>
-        <name>hive.metastore.warehouse.dir</name>
-        <value>/usr/hive/warehouse</value>
-    </property>
-
-    <property>
-        <name>hive.querylog.location</name>
-        <value>/data/emr/hive/tmp</value>
-    </property>
-
-    <property>
-        <name>hive.server2.authentication</name>
-        <value>kerberos</value>
-    </property>
-
-    <property>
-        <name>hive.server2.authentication.kerberos.keytab</name>
-        <value>/var/krb5kdc/emr.keytab</value>
-    </property>
-
-    <property>
-        <name>hive.server2.authentication.kerberos.principal</name>
-        <value>hadoop/_HOST@EMR-7A4Z5V49</value>
-    </property>
-
-    <property>
-        <name>hive.server2.logging.operation.log.location</name>
-        <value>/data/emr/hive/tmp/operation_logs</value>
-    </property>
-
-    <property>
-        <name>hive.server2.metrics.enabled</name>
-        <value>true</value>
-    </property>
-
-    <property>
-        <name>hive.server2.support.dynamic.service.discovery</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.server2.thrift.bind.host</name>
-        <value>10.254.20.14</value>
-    </property>
-
-    <property>
-        <name>hive.server2.thrift.http.port</name>
-        <value>7000</value>
-    </property>
-
-    <property>
-        <name>hive.server2.thrift.port</name>
-        <value>7001</value>
-    </property>
-
-    <property>
-        <name>hive.server2.webui.host</name>
-        <value>0.0.0.0</value>
-    </property>
-
-    <property>
-        <name>hive.server2.webui.port</name>
-        <value>7003</value>
-    </property>
-
-    <property>
-        <name>hive.service.metrics.reporter</name>
-        <value>JMX</value>
-    </property>
-
-    <property>
-        <name>hive.stats.autogather</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hive.tez.container.size</name>
-        <value>1024</value>
-    </property>
-
-    <property>
-        <name>hive.zookeeper.quorum</name>
-        <value>10.254.20.14:2181</value>
-    </property>
-
-    <property>
-        <name>io.compression.codec.lzo.class</name>
-        <value>com.hadoop.compression.lzo.LzoCodec</value>
-    </property>
-
-    <property>
-        <name>io.compression.codecs</name>
-        <value>org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.GzipCodec,com.hadoop.compression.lzo.LzoCodec,com.hadoop.compression.lzo.LzopCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
-    </property>
-
-    <property>
-        <name>javax.jdo.option.ConnectionDriverName</name>
-        <value>com.mysql.jdbc.Driver</value>
-    </property>
-
-    <property>
-        <name>javax.jdo.option.ConnectionURL</name>
-        <value>jdbc:mysql://10.254.20.16:3306/hivemetastore?useSSL=false&amp;createDatabaseIfNotExist=true&amp;characterEncoding=UTF-8</value>
-    </property>
-
-    <property>
-        <name>javax.jdo.option.ConnectionUserName</name>
-        <value>root</value>
-    </property>
-
-    <property>
-        <name>spark.yarn.jars</name>
-        <value>hdfs:///spark/jars/*</value>
-    </property>
-
-</configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<configuration>
+
+    <property>
+        <name>datanucleus.schema.autoCreateTables</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hbase.zookeeper.quorum</name>
+        <value>10.254.20.23:2181,10.254.20.29:2181,10.254.20.26:2181</value>
+    </property>
+
+    <property>
+        <name>hive.downloaded.resources.dir</name>
+        <value>/data/emr/hive/tmp/${hive.session.id}_resources</value>
+    </property>
+
+    <property>
+        <name>hive.exec.dynamic.partition.mode</name>
+        <value>nonstrict</value>
+    </property>
+
+    <property>
+        <name>hive.exec.failure.hooks</name>
+        <value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
+    </property>
+
+    <property>
+        <name>hive.exec.local.scratchdir</name>
+        <value>/data/emr/hive/tmp</value>
+    </property>
+
+    <property>
+        <name>hive.exec.parallel = true</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.exec.parallel.thread.number</name>
+        <value>16</value>
+    </property>
+
+    <property>
+        <name>hive.exec.post.hooks</name>
+        <value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
+    </property>
+
+    <property>
+        <name>hive.exec.pre.hooks</name>
+        <value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
+    </property>
+
+    <property>
+        <name>hive.execution.engine</name>
+        <value>tez</value>
+    </property>
+
+    <property>
+        <name>hive.fetch.task.aggr</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.hwi.listen.host</name>
+        <value>0.0.0.0</value>
+    </property>
+
+    <property>
+        <name>hive.hwi.listen.port</name>
+        <value>7002</value>
+    </property>
+
+    <property>
+        <name>hive.llap.daemon.output.service.port</name>
+        <value>7009</value>
+    </property>
+
+    <property>
+        <name>hive.llap.daemon.rpc.port</name>
+        <value>7007</value>
+    </property>
+
+    <property>
+        <name>hive.llap.daemon.web.port</name>
+        <value>7008</value>
+    </property>
+
+    <property>
+        <name>hive.llap.daemon.yarn.shuffle.port</name>
+        <value>7006</value>
+    </property>
+
+    <property>
+        <name>hive.llap.management.rpc.port</name>
+        <value>7005</value>
+    </property>
+
+    <property>
+        <name>hive.merge.mapfiles</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.merge.mapredfiles</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.merge.size.per.task</name>
+        <value>134217728</value>
+    </property>
+
+    <property>
+        <name>hive.merge.smallfiles.avgsize</name>
+        <value>134217728</value>
+    </property>
+
+    <property>
+        <name>hive.merge.sparkfiles</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.merge.tezfiles</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.db.encoding</name>
+        <value>UTF-8</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.event.db.notification.api.auth</name>
+        <value>false</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.kerberos.keytab.file</name>
+        <value>/var/krb5kdc/emr.keytab</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.kerberos.principal</name>
+        <value>hadoop/_HOST@EMR-5XJSY31F</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.metrics.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.port</name>
+        <value>7004</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.sasl.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.schema.verification</name>
+        <value>false</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.schema.verification.record.version</name>
+        <value>false</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.uris</name>
+        <value>thrift://10.254.20.18:7004,thrift://10.254.20.22:7004</value>
+    </property>
+
+    <property>
+        <name>hive.metastore.warehouse.dir</name>
+        <value>/usr/hive/warehouse</value>
+    </property>
+
+    <property>
+        <name>hive.querylog.location</name>
+        <value>/data/emr/hive/tmp</value>
+    </property>
+
+    <property>
+        <name>hive.server2.authentication</name>
+        <value>kerberos</value>
+    </property>
+
+    <property>
+        <name>hive.server2.authentication.kerberos.keytab</name>
+        <value>/var/krb5kdc/emr.keytab</value>
+    </property>
+
+    <property>
+        <name>hive.server2.authentication.kerberos.principal</name>
+        <value>hadoop/_HOST@EMR-5XJSY31F</value>
+    </property>
+
+    <property>
+        <name>hive.server2.logging.operation.log.location</name>
+        <value>/data/emr/hive/tmp/operation_logs</value>
+    </property>
+
+    <property>
+        <name>hive.server2.metrics.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.server2.support.dynamic.service.discovery</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.server2.thrift.bind.host</name>
+        <value>10.254.20.28</value>
+    </property>
+
+    <property>
+        <name>hive.server2.thrift.http.port</name>
+        <value>7000</value>
+    </property>
+
+    <property>
+        <name>hive.server2.thrift.port</name>
+        <value>7001</value>
+    </property>
+
+    <property>
+        <name>hive.server2.webui.host</name>
+        <value>0.0.0.0</value>
+    </property>
+
+    <property>
+        <name>hive.server2.webui.max.threads</name>
+        <value>50</value>
+    </property>
+
+    <property>
+        <name>hive.server2.webui.port</name>
+        <value>7003</value>
+    </property>
+
+    <property>
+        <name>hive.server2.zookeeper.namespace</name>
+        <value>hiveserver2</value>
+    </property>
+
+    <property>
+        <name>hive.service.metrics.reporter</name>
+        <value>JMX</value>
+    </property>
+
+    <property>
+        <name>hive.stats.autogather</name>
+        <value>false</value>
+    </property>
+
+    <property>
+        <name>hive.tez.am.max.app.attempts</name>
+        <value>5</value>
+    </property>
+
+    <property>
+        <name>hive.tez.am.task.max.failed.attempts</name>
+        <value>10</value>
+    </property>
+
+    <property>
+        <name>hive.tez.auto.reducer.parallelism</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.tez.container.size</name>
+        <value>1024</value>
+    </property>
+
+    <property>
+        <name>hive.vectorized.execution.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.vectorized.execution.mapjoin.minmax.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.vectorized.execution.mapjoin.native.fast.hashtable.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.vectorized.execution.mapjoin.native.multikey.only.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>hive.zookeeper.client.port</name>
+        <value>2181</value>
+    </property>
+
+    <property>
+        <name>hive.zookeeper.quorum</name>
+        <value>10.254.20.23:2181,10.254.20.29:2181,10.254.20.26:2181</value>
+    </property>
+
+    <property>
+        <name>io.compression.codec.lzo.class</name>
+        <value>com.hadoop.compression.lzo.LzoCodec</value>
+    </property>
+
+    <property>
+        <name>io.compression.codecs</name>
+        <value>org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.GzipCodec,com.hadoop.compression.lzo.LzoCodec,com.hadoop.compression.lzo.LzopCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
+    </property>
+
+    <property>
+        <name>javax.jdo.option.ConnectionDriverName</name>
+        <value>com.mysql.jdbc.Driver</value>
+    </property>
+
+    <property>
+        <name>javax.jdo.option.ConnectionPassword</name>
+        <value>UYdfjsdDigf8d3U</value>
+    </property>
+
+    <property>
+        <name>javax.jdo.option.ConnectionURL</name>
+        <value>jdbc:mysql://10.254.20.16:3306/hivemetastore?useSSL=false&amp;createDatabaseIfNotExist=true&amp;characterEncoding=UTF-8</value>
+    </property>
+
+    <property>
+        <name>javax.jdo.option.ConnectionUserName</name>
+        <value>root</value>
+    </property>
+
+    <property>
+        <name>mapreduce.cluster.local.dir</name>
+        <value>/data/emr/hive/tmp/tmp</value>
+    </property>
+
+    <property>
+        <name>spark.driver.extraLibraryPath</name>
+        <value>/usr/local/service/hadoop/lib/native:/usr/local/service/hadoop/lib/native/Linux-amd64-64/lib</value>
+    </property>
+
+    <property>
+        <name>spark.eventLog.dir</name>
+        <value>hdfs://HDFS8000912/spark-history</value>
+    </property>
+
+    <property>
+        <name>spark.eventLog.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>spark.executor.extraLibraryPath</name>
+        <value>/usr/local/service/hadoop/lib/native:/usr/local/service/hadoop/lib/native/Linux-amd64-64/lib</value>
+    </property>
+
+    <property>
+        <name>spark.history.fs.cleaner.enabled</name>
+        <value>true</value>
+    </property>
+
+    <property>
+        <name>spark.home</name>
+        <value>/usr/local/service/spark</value>
+    </property>
+
+    <property>
+        <name>spark.yarn.jars</name>
+        <value>hdfs:///spark/jars/*</value>
+    </property>
+
+</configuration>

yili-conf/cluster/conf/spark-defaults.conf

@@ -30,4 +30,4 @@ spark.submit.deployMode cluster
 spark.sql.hive.metastore.version 2.3.7
 spark.yarn.dist.archives hdfs:/user/ailab/python_env.tar.gz#python_env
 spark.pyspark.python ./python_env/bin/python
-#spark.yarn.archive hdfs:/user/ailab/spark_lib.tar.gz
+spark.yarn.archive hdfs:/user/ailab/spark_libs.zip

yili-conf/cluster/conf/yarn-site.xml

@@ -40,7 +40,7 @@
 	
 	<property>
 		<name>yarn.log.server.url</name>
-		<value>http://10.254.20.14:5024/jobhistory/logs</value>
+		<value>http://10.254.20.18:5024/jobhistory/logs</value>
 	</property>
 	
 	<property>
@@ -50,7 +50,7 @@
 	
 	<property>
 		<name>yarn.nodemanager.address</name>
-		<value>10.254.20.14:5006</value>
+		<value>10.254.20.28:5006</value>
 	</property>
 	
 	<property>
@@ -68,9 +68,34 @@
 		<value>org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor</value>
 	</property>
 	
+	<property>
+		<name>yarn.nodemanager.container-manager.thread-count</name>
+		<value>100</value>
+	</property>
+	
+	<property>
+		<name>yarn.nodemanager.container-metrics.period-ms</name>
+		<value>10000</value>
+	</property>
+	
+	<property>
+		<name>yarn.nodemanager.container-monitor.procfs-tree.smaps-based-rss.enabled</name>
+		<value>true</value>
+	</property>
+	
+	<property>
+		<name>yarn.nodemanager.delete.debug-delay-sec</name>
+		<value>180</value>
+	</property>
+	
+	<property>
+		<name>yarn.nodemanager.delete.thread-count</name>
+		<value>16</value>
+	</property>
+	
 	<property>
 		<name>yarn.nodemanager.hostname</name>
-		<value>10.254.20.14</value>
+		<value>10.254.20.28</value>
 	</property>
 	
 	<property>
@@ -95,7 +120,7 @@
 	
 	<property>
 		<name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name>
-		<value>true</value>
+		<value>false</value>
 	</property>
 	
 	<property>
@@ -120,7 +145,7 @@
 	
 	<property>
 		<name>yarn.nodemanager.localizer.address</name>
-		<value>10.254.20.14:5007</value>
+		<value>10.254.20.28:5007</value>
 	</property>
 	
 	<property>
@@ -140,7 +165,17 @@
 	
 	<property>
 		<name>yarn.nodemanager.principal</name>
-		<value>hadoop/_HOST@EMR-7A4Z5V49</value>
+		<value>hadoop/_HOST@EMR-5XJSY31F</value>
+	</property>
+	
+	<property>
+		<name>yarn.nodemanager.recovery.dir</name>
+		<value>/data/emr/yarn/nodemanger-recovery</value>
+	</property>
+	
+	<property>
+		<name>yarn.nodemanager.recovery.enabled</name>
+		<value>true</value>
 	</property>
 	
 	<property>
@@ -150,12 +185,12 @@
 	
 	<property>
 		<name>yarn.nodemanager.resource.cpu-vcores</name>
-		<value>1</value>
+		<value>8</value>
 	</property>
 	
 	<property>
 		<name>yarn.nodemanager.resource.memory-mb</name>
-		<value>1024</value>
+		<value>29491</value>
 	</property>
 	
 	<property>
@@ -175,22 +210,32 @@
 	
 	<property>
 		<name>yarn.nodemanager.webapp.address</name>
-		<value>10.254.20.14:5008</value>
+		<value>10.254.20.28:5008</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.address.rm1</name>
+		<value>10.254.20.18:5000</value>
 	</property>
 	
 	<property>
-		<name>yarn.resourcemanager.address</name>
-		<value>10.254.20.14:5000</value>
+		<name>yarn.resourcemanager.address.rm2</name>
+		<value>10.254.20.22:5000</value>
 	</property>
 	
 	<property>
-		<name>yarn.resourcemanager.admin.address</name>
-		<value>10.254.20.14:5003</value>
+		<name>yarn.resourcemanager.admin.address.rm1</name>
+		<value>10.254.20.18:5003</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.admin.address.rm2</name>
+		<value>10.254.20.22:5003</value>
 	</property>
 	
 	<property>
 		<name>yarn.resourcemanager.cluster-id</name>
-		<value>emr-7a4z5v49</value>
+		<value>emr-5xjsy31f</value>
 	</property>
 	
 	<property>
@@ -200,17 +245,22 @@
 	
 	<property>
 		<name>yarn.resourcemanager.ha.automatic-failover.embedded</name>
-		<value>false</value>
+		<value>true</value>
 	</property>
 	
 	<property>
 		<name>yarn.resourcemanager.ha.automatic-failover.enabled</name>
-		<value>false</value>
+		<value>true</value>
 	</property>
 	
 	<property>
 		<name>yarn.resourcemanager.ha.enabled</name>
-		<value>false</value>
+		<value>true</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.ha.rm-ids</name>
+		<value>rm1,rm2</value>
 	</property>
 	
 	<property>
@@ -240,7 +290,7 @@
 	
 	<property>
 		<name>yarn.resourcemanager.principal</name>
-		<value>hadoop/_HOST@EMR-7A4Z5V49</value>
+		<value>hadoop/_HOST@EMR-5XJSY31F</value>
 	</property>
 	
 	<property>
@@ -249,13 +299,23 @@
 	</property>
 	
 	<property>
-		<name>yarn.resourcemanager.resource-tracker.address</name>
-		<value>10.254.20.14:5002</value>
+		<name>yarn.resourcemanager.resource-tracker.address.rm1</name>
+		<value>10.254.20.18:5002</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.resource-tracker.address.rm2</name>
+		<value>10.254.20.22:5002</value>
 	</property>
 	
 	<property>
-		<name>yarn.resourcemanager.scheduler.address</name>
-		<value>10.254.20.14:5001</value>
+		<name>yarn.resourcemanager.scheduler.address.rm1</name>
+		<value>10.254.20.18:5001</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.scheduler.address.rm2</name>
+		<value>10.254.20.22:5001</value>
 	</property>
 	
 	<property>
@@ -265,27 +325,42 @@
 	
 	<property>
 		<name>yarn.resourcemanager.store.class</name>
-		<value>org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore</value>
+		<value>org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore</value>
 	</property>
 	
 	<property>
-		<name>yarn.resourcemanager.webapp.address</name>
-		<value>10.254.20.14:5004</value>
+		<name>yarn.resourcemanager.system-metrics-publisher.enabled</name>
+		<value>true</value>
 	</property>
 	
 	<property>
-		<name>yarn.resourcemanager.webapp.https.address</name>
-		<value>10.254.20.14:5005</value>
+		<name>yarn.resourcemanager.webapp.address.rm1</name>
+		<value>10.254.20.18:5004</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.webapp.address.rm2</name>
+		<value>10.254.20.22:5004</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.webapp.https.address.rm1</name>
+		<value>10.254.20.18:5005</value>
+	</property>
+	
+	<property>
+		<name>yarn.resourcemanager.webapp.https.address.rm2</name>
+		<value>10.254.20.22:5005</value>
 	</property>
 	
 	<property>
 		<name>yarn.resourcemanager.zk-address</name>
-		<value></value>
+		<value>10.254.20.23:2181,10.254.20.29:2181,10.254.20.26:2181</value>
 	</property>
 	
 	<property>
 		<name>yarn.resourcemanager.zk.state-store.address</name>
-		<value></value>
+		<value>10.254.20.23:2181,10.254.20.29:2181,10.254.20.26:2181</value>
 	</property>
 	
 	<property>
@@ -318,4 +393,39 @@
 		<value>1</value>
 	</property>
 	
+	<property>
+		<name>yarn.timeline-service.bind-host</name>
+		<value>0.0.0.0</value>
+	</property>
+	
+	<property>
+		<name>yarn.timeline-service.enabled</name>
+		<value>true</value>
+	</property>
+	
+	<property>
+		<name>yarn.timeline-service.hostname</name>
+		<value>10.254.20.18</value>
+	</property>
+	
+	<property>
+		<name>yarn.timeline-service.http-cross-origin.enabled</name>
+		<value>true</value>
+	</property>
+	
+	<property>
+		<name>yarn.timeline-service.keytab</name>
+		<value>/var/krb5kdc/emr.keytab</value>
+	</property>
+	
+	<property>
+		<name>yarn.timeline-service.leveldb-timeline-store.path</name>
+		<value>/data/emr/yarn/timeline-db</value>
+	</property>
+	
+	<property>
+		<name>yarn.timeline-service.principal</name>
+		<value>hadoop/_HOST@EMR-5XJSY31F</value>
+	</property>
+	
 </configuration>