You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/05/16 15:36:55 UTC
[2/2] ambari git commit: AMBARI-11171 - Ambari should add the
configurations to enable timeline service state preserving restart
AMBARI-11171 - Ambari should add the configurations to enable timeline service state preserving restart
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a4b24cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a4b24cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a4b24cb
Branch: refs/heads/trunk
Commit: 9a4b24cb2f6973fed229365253afc4dda8994c45
Parents: 45822d2
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Fri May 15 18:12:46 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Sat May 16 16:29:23 2015 +0300
----------------------------------------------------------------------
.../services/YARN/configuration/yarn-site.xml | 19 +++++++++++++++++++
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 12 +-----------
.../services/YARN/configuration/yarn-site.xml | 5 +++++
3 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a4b24cb/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index 8898d20..049eeb2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -277,6 +277,25 @@
Enable age off of timeline store data.
</description>
</property>
+
+ <property>
+ <name>yarn.timeline-service.recovery.enabled</name>
+ <value>false</value>
+ <description>Enable timeline server to recover state after starting. If
+ true, then yarn.timeline-service.state-store-class must be specified.
+ </description>
+ </property>
+ <property>
+ <name>yarn.timeline-service.state-store-class</name>
+ <value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value>
+ <description>Store class name for timeline state store.</description>
+ </property>
+ <property>
+ <name>yarn.timeline-service.leveldb-state-store.path</name>
+ <value>/hadoop/yarn/timeline</value>
+ <description>Store file name for leveldb state store.</description>
+ </property>
+
<property>
<name>yarn.timeline-service.leveldb-timeline-store.path</name>
<value>/hadoop/yarn/timeline</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a4b24cb/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 43db5b0..8905561 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -393,17 +393,6 @@
<key>yarn.timeline-service.recovery.enabled</key>
<value>true</value>
</task>
-
- <task xsi:type="configure">
- <type>yarn-site</type>
- <transfer operation="copy" from-key="yarn.timeline-service.leveldb-timeline-store.path" to-key="yarn.timeline-service.leveldb-state-store.path"/>
- </task>
-
- <task xsi:type="configure">
- <type>yarn-site</type>
- <key>yarn.timeline-service.state-store-class</key>
- <value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value>
- </task>
</pre-upgrade>
<upgrade>
@@ -436,6 +425,7 @@
</upgrade>
</component>
</service>
+
<service name="HBASE">
<component name="HBASE_MASTER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a4b24cb/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index 852c192..58c817f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
@@ -26,4 +26,9 @@
<deleted>true</deleted>
</property>
+ <property>
+ <name>yarn.timeline-service.recovery.enabled</name>
+ <value>true</value>
+ </property>
+
</configuration>
\ No newline at end of file