You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/02/18 20:38:49 UTC
ambari git commit: AMBARI-15066. Spark History server does not start
after downgrade due to missing spark-events directory (Jeff Zhang via
alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 2b1f7496e -> 53bf27065
AMBARI-15066. Spark History server does not start after downgrade due to missing spark-events directory (Jeff Zhang via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53bf2706
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53bf2706
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53bf2706
Branch: refs/heads/branch-2.2
Commit: 53bf270657ae268c0ffd806f623da1a5650bbd09
Parents: 2b1f749
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Thu Feb 18 11:38:09 2016 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Thu Feb 18 11:38:09 2016 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 13 +++++++------
.../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 2 ++
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/53bf2706/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index 23ecc63..50a9848 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -314,6 +314,13 @@
<task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
</execute-stage>
+ <!-- SPARK -->
+ <execute-stage service="SPARK" component="SPARK_JOBHISTORYSERVER" title="Apply config changes for Spark JobHistoryServer">
+ <task xsi:type="configure" id="hdp_2_4_0_0_spark_jobhistoryserver"/>
+ </execute-stage>
+ <execute-stage service="SPARK" component="SPARK_THRIFTSERVER" title="Apply config changes for Spark ThriftServer">
+ <task xsi:type="configure" id="hdp_2_4_0_0_spark_thriftserver"/>
+ </execute-stage>
</group>
<!-- Now, restart all of the services. -->
@@ -878,17 +885,11 @@
<service name="SPARK">
<component name="SPARK_JOBHISTORYSERVER">
- <pre-upgrade>
- <task xsi:type="configure" id="hdp_2_4_0_0_spark_jobhistoryserver"/>
- </pre-upgrade>
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
</component>
<component name="SPARK_THRIFTSERVER">
- <pre-upgrade>
- <task xsi:type="configure" id="hdp_2_4_0_0_spark_thriftserver"/>
- </pre-upgrade>
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/53bf2706/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index 42148b0..29ebc1f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -658,6 +658,7 @@
<service name="SPARK">
<component name="SPARK_JOBHISTORYSERVER">
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_jobhistoryserver"/>
</pre-upgrade>
@@ -666,6 +667,7 @@
</upgrade>
</component>
<component name="SPARK_THRIFTSERVER">
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_thriftserver"/>
</pre-upgrade>