Repository: ambari Updated Branches: refs/heads/trunk 15000e505 -> 29410e60a
AMBARI-11245 - ConfigurationTask Should Support Multiple Configurations Per Task (part2) (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29410e60 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29410e60 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29410e60 Branch: refs/heads/trunk Commit: 29410e60a1ec98f5779fd6fcd570de8c83df6490 Parents: 15000e5 Author: Jonathan Hurley <[email protected]> Authored: Wed May 20 01:14:35 2015 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Wed May 20 01:14:35 2015 -0400 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/29410e60/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 37a75113..7505a07 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 @@ -362,7 +362,7 @@ <pre-upgrade> <task xsi:type="configure"> <type>mapred-site</type> - <transfer operation="move" from-key="mapreduce.job.speculative.speculativecap" to-key="mapreduce.job.speculative.speculative-cap-running-tasks" default-value="0.1" /> + <transfer operation="move" from-key="mapreduce.job.speculative.speculativecap" to-key="mapreduce.job.speculative.speculative-cap-running-tasks" default-value="0.1"/> <transfer operation="delete" delete-key="mapreduce.task.tmp.dir" /> <set key="mapreduce.fileoutputcommitter.algorithm.version" value="1"/> </task> @@ -386,6 +386,8 @@ <task xsi:type="configure"> <type>yarn-site</type> <set key="yarn.timeline-service.recovery.enabled" value="true"/> + <set key="yarn.timeline-service.state-store-class" value="org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore"/> + <transfer operation="copy" from-key="yarn.timeline-service.leveldb-timeline-store.path" to-key="yarn.timeline-service.leveldb-state-store.path" default-value="/hadoop/yarn/timeline"/> </task> </pre-upgrade> @@ -402,8 +404,7 @@ </task> <task xsi:type="configure"> <type>capacity-scheduler</type> - <key>yarn.scheduler.capacity.root.default-node-label-expression</key> - <value></value> + <set key="yarn.scheduler.capacity.root.default-node-label-expression" value=""/> </task> </pre-upgrade> <upgrade>
