You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/08/27 11:43:55 UTC
[1/4] ambari git commit: AMBARI-18232. Upgrade Execute: add xsd for
upgrade packs (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 16e04b2ba -> 2ef600f4d
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/upgrade-pack.xsd
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade-pack.xsd b/ambari-server/src/main/resources/upgrade-pack.xsd
new file mode 100644
index 0000000..b02d941
--- /dev/null
+++ b/ambari-server/src/main/resources/upgrade-pack.xsd
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.1">
+ <xs:annotation>
+ <xs:documentation>
+ This document describes the schema for an Upgrade Pack
+ </xs:documentation>
+ </xs:annotation>
+
+ <!-- FIXME case sensitivity -->
+ <xs:simpleType name="upgrade-kind-type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="ROLLING" />
+ <xs:enumeration value="NON_ROLLING" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="host-target-type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="master" />
+ <xs:enumeration value="any" />
+ <xs:enumeration value="all" />
+ <xs:enumeration value="first" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="direction-type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="UPGRADE" />
+ <xs:enumeration value="DOWNGRADE" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="scope-type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="COMPLETE" />
+ <xs:enumeration value="PARTIAL" />
+ <xs:enumeration value="ANY" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="prerequisite-check-type">
+ <xs:sequence>
+ <xs:element name="check" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="configuration" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="check-properties" minOccurs="0" maxOccurs="unbounded">
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="abstract-group-type" abstract="true">
+ <xs:sequence>
+ <xs:element name="scope" type="scope-type" minOccurs="0" />
+ <xs:element name="direction" type="direction-type" minOccurs="0" />
+ <xs:element name="service-check" minOccurs="0" type="xs:boolean" />
+ <xs:element name="skippable" minOccurs="0" type="xs:boolean" />
+ <xs:element name="supports-auto-skip-failure" minOccurs="0" type="xs:boolean" />
+ <xs:element name="allow-retry" minOccurs="0" type="xs:boolean"/>
+ <xs:element name="add-after-group" minOccurs="0" />
+ <xs:element name="add-after-group-entry" minOccurs="0" />
+
+ <xs:element name="parallel-scheduler" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="max-degree-of-parallelism" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="service" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="component" minOccurs="1" maxOccurs="unbounded" />
+ </xs:sequence>
+ <xs:attribute name="name" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" />
+ <xs:attribute name="title" type="xs:string" />
+ </xs:complexType>
+
+ <xs:complexType name="cluster">
+ <xs:complexContent>
+ <xs:extension base="abstract-group-type">
+ <xs:sequence>
+ <xs:element name="execute-stage" minOccurs="1" maxOccurs="unbounded">
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="colocated">
+ <xs:complexContent>
+ <xs:extension base="abstract-group-type">
+ <xs:sequence>
+ <xs:element name="batch">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="percent" />
+ <xs:element name="summary" minOccurs="0" />
+ <xs:element name="message" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="service-check">
+ <xs:complexContent>
+ <xs:extension base="abstract-group-type">
+ <xs:sequence>
+ <xs:element name="priority" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="service" minOccurs="1" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="exclude" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="service" minOccurs="1" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="start">
+ <xs:complexContent>
+ <xs:extension base="abstract-group-type">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="stop">
+ <xs:complexContent>
+ <xs:extension base="abstract-group-type">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="restart">
+ <xs:complexContent>
+ <xs:extension base="abstract-group-type">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="update-stack">
+ <xs:complexContent>
+ <xs:extension base="cluster">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="abstract-task-type" abstract="true">
+ <xs:sequence>
+ <xs:element name="scope" minOccurs="0" type="scope-type" />
+ <xs:element name="summary" minOccurs="0" />
+ </xs:sequence>
+ <xs:attribute name="sequential" use="optional" type="xs:boolean" />
+ </xs:complexType>
+
+ <xs:complexType name="restart-task">
+ <xs:complexContent>
+ <xs:extension base="abstract-task-type">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="abstract-server-task-type">
+ <xs:complexContent>
+ <xs:extension base="abstract-task-type">
+ <xs:sequence>
+ <xs:element name="message" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="server_action">
+ <xs:complexContent>
+ <xs:extension base="abstract-server-task-type">
+ <xs:sequence />
+ <xs:attribute name="class" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="manual">
+ <xs:complexContent>
+ <xs:extension base="abstract-server-task-type">
+ <xs:sequence />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="execute">
+ <xs:complexContent>
+ <xs:extension base="abstract-server-task-type">
+ <xs:sequence>
+ <xs:element name="script" />
+ <xs:element name="function" />
+ </xs:sequence>
+ <xs:attribute name="hosts" use="optional" type="host-target-type" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="configure">
+ <xs:complexContent>
+ <xs:extension base="abstract-server-task-type">
+ <xs:sequence />
+ <xs:attribute name="id" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="configure_function">
+ <xs:complexContent>
+ <xs:extension base="abstract-task-type">
+ <xs:sequence />
+ <xs:attribute name="hosts" use="optional" type="host-target-type" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="order-type">
+ <xs:sequence>
+ <xs:element name="group" minOccurs="1" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="upgrade-directive-type">
+ <xs:sequence>
+ <xs:element name="task" type="abstract-task-type" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="processing-type">
+ <xs:sequence>
+ <xs:element name="service" minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="component" minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="pre-upgrade" type="upgrade-directive-type" minOccurs="0"/>
+ <xs:element name="pre-downgrade" type="upgrade-directive-type" minOccurs="0" />
+ <xs:element name="upgrade" type="upgrade-directive-type" minOccurs="1" />
+ <xs:element name="post-upgrade" type="upgrade-directive-type" minOccurs="0" />
+ <xs:element name="post-downgrade" type="upgrade-directive-type" minOccurs="0" />
+ </xs:sequence>
+ <!--
+ Want to use <xs:assert> to make sure that a pre-downgrade is available i
+ pre-upgrade is set. It appears as though that is not yet available to jaxb.
+ -->
+ <xs:attribute name="name" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="upgrade-path-type">
+ <xs:sequence>
+ <xs:element name="intermediate-stack">
+ <xs:complexType>
+ <xs:sequence />
+ <xs:attribute name="version" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+
+ <xs:element name="upgrade">
+ <xs:annotation>
+ <xs:documentation>
+ This is the root element of an Upgrade Pack
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="target" type="xs:string" />
+ <xs:element name="target-stack" type="xs:string" />
+ <xs:element name="skip-failures" minOccurs="0" type="xs:boolean" />
+ <xs:element name="skip-service-check-failures" minOccurs="0" type="xs:boolean" />
+ <xs:element name="downgrade-allowed" minOccurs="0" type="xs:boolean" />
+ <xs:element name="type" type="upgrade-kind-type" />
+ <xs:element name="prerequisite-checks" type="prerequisite-check-type" minOccurs="0" />
+ <xs:element name="upgrade-path" type="upgrade-path-type" minOccurs="0" />
+ <xs:element name="order" type="order-type" />
+ <xs:element name="processing" type="processing-type">
+ <xs:unique name="unique-by-service">
+ <xs:annotation>
+ <xs:documentation>Ensures that the element "processing" does not have duplicate services</xs:documentation>
+ </xs:annotation>
+ <xs:selector xpath="service" />
+ <xs:field xpath="@name" />
+ </xs:unique>
+ <xs:unique name="unique-by-component">
+ <xs:annotation>
+ <xs:documentation>Ensures that the element "processing" does not have duplicate components</xs:documentation>
+ </xs:annotation>
+ <xs:selector xpath="service/component" />
+ <xs:field xpath="@name" />
+ </xs:unique>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+
+
+</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
index c6701b6..97e50c3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -33,6 +35,7 @@ import java.util.Set;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.stack.ModuleFileUnmarshaller;
import org.apache.ambari.server.state.stack.UpgradePack.PrerequisiteCheckConfig;
import org.apache.ambari.server.state.stack.UpgradePack.ProcessingComponent;
import org.apache.ambari.server.state.stack.upgrade.ClusterGrouping;
@@ -48,10 +51,15 @@ import org.apache.ambari.server.state.stack.upgrade.StopGrouping;
import org.apache.ambari.server.state.stack.upgrade.Task;
import org.apache.ambari.server.state.stack.upgrade.UpdateStackGrouping;
import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.FileFilterUtils;
+import org.apache.commons.io.filefilter.IOFileFilter;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -65,6 +73,8 @@ public class UpgradePackTest {
private Injector injector;
private AmbariMetaInfo ambariMetaInfo;
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradePackTest.class);
+
@Before
public void before() throws Exception {
injector = Guice.createInjector(new InMemoryDefaultTestModule());
@@ -79,6 +89,58 @@ public class UpgradePackTest {
}
@Test
+ public void findAndValidateUpgradePacks() throws Exception {
+
+ IOFileFilter filter = new IOFileFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return false;
+ }
+
+ @Override
+ public boolean accept(File file) {
+ // file has the folder named 'upgrades', ends with '.xml' and is NOT 'config-upgrade.xml'
+ if (file.getAbsolutePath().contains("upgrades") &&
+ file.getAbsolutePath().endsWith(".xml") &&
+ !file.getAbsolutePath().contains("config-upgrade.xml")) {
+
+ return true;
+ }
+
+ return false;
+ }
+ };
+
+ List<File> files = new ArrayList<>();
+
+ files.addAll(FileUtils.listFiles(new File("src/main/resources/stacks"), filter,
+ FileFilterUtils.directoryFileFilter()));
+
+ files.addAll(FileUtils.listFiles(new File("src/test/resources/stacks"), filter,
+ FileFilterUtils.directoryFileFilter()));
+
+ files.addAll(FileUtils.listFiles(new File("src/test/resources/stacks_with_upgrade_cycle"), filter,
+ FileFilterUtils.directoryFileFilter()));
+
+ ModuleFileUnmarshaller unmarshaller = new ModuleFileUnmarshaller();
+
+ for (File file : files) {
+ String fileContent = FileUtils.readFileToString(file, "UTF-8");
+
+ // these things must be in upgrade packs for them to work anyway
+ if (fileContent.contains("<upgrade") && fileContent.contains("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"")) {
+ if (!fileContent.contains("xsi:noNamespaceSchemaLocation=\"upgrade-pack.xsd\"")) {
+ String msg = String.format("File %s appears to be an upgrade pack, but does not define 'upgrade-pack.xsd' as its schema",
+ file.getAbsolutePath());
+ Assert.fail(msg);
+ } else {
+ unmarshaller.unmarshal(UpgradePack.class, file, true);
+ }
+ }
+ }
+ }
+
+ @Test
public void testExistence() throws Exception {
Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("foo", "bar");
assertTrue(upgrades.isEmpty());
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
index fd798da..6ac5b68 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*</target>
<target-stack>HDP-2.4.0</target-stack>
<type>ROLLING</type>
@@ -70,6 +70,11 @@
<service name="HBASE">
<component>REGIONSERVER</component>
</service>
+ <batch>
+ <percent>1</percent>
+ <summary>Summary</summary>
+ <message>Message</message>
+ </batch>
</group>
</order>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
index 085ba25..8ca9df4 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_bucket_test.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.6</target-stack>
<type>ROLLING</type>
@@ -49,16 +49,21 @@
<message>pre-manual 1 task to run on all hosts</message>
</task>
<task xsi:type="execute">
- <command>pre-ls 1 to run on all hosts</command>
+ <script>foo</script>
+ <function>bar1</function>
</task>
<task xsi:type="execute">
- <command>pre-ls 2 to run on all hosts</command>
+ <script>foo</script>
+ <function>bar1</function>
</task>
</pre-upgrade>
+ <upgrade />
+
<post-upgrade>
<task xsi:type="execute">
- <command>post-ls 1 to run on all hosts</command>
+ <script>foo</script>
+ <function>bar1</function>
</task>
<task xsi:type="manual">
<message>post-manual 1 task to run on all hosts</message>
@@ -67,13 +72,16 @@
<message>post-manual 2 task to run on all hosts</message>
</task>
<task xsi:type="execute">
- <command>post-ls 2 to run on all hosts</command>
+ <script>foo</script>
+ <function>bar2</function>
</task>
<task xsi:type="execute">
- <command>post-ls 3 to run on all hosts</command>
+ <script>foo</script>
+ <function>bar3</function>
</task>
<task xsi:type="execute">
- <command>post-ls 4 to run on all hosts</command>
+ <script>foo</script>
+ <function>bar4</function>
</task>
</post-upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
index 76e42d7..92fd0b2 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_direction.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.5</target-stack>
<type>ROLLING</type>
@@ -92,7 +92,7 @@
<task xsi:type="restart-task" />
</upgrade>
<post-upgrade>
- <task xsi:type="configure" />
+ <task xsi:type="configure" id="foo" />
</post-upgrade>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_grouping_rolling.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_grouping_rolling.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_grouping_rolling.xml
index b8b5511..292976a 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_grouping_rolling.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_grouping_rolling.xml
@@ -15,15 +15,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
<order>
<group xsi:type="stop" name="STOP_ZOOKEEPER" title="Stop ZooKeeper">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="ZOOKEEPER">
<component>ZOOKEEPER_SERVER</component>
</service>
@@ -46,4 +46,4 @@
</component>
</service>
</processing>
-</upgrade>
\ No newline at end of file
+</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
index c79c8e7..789df2e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0.1</target-stack>
<type>NON_ROLLING</type>
@@ -59,9 +59,9 @@
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
<direction>UPGRADE</direction>
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="FLUME">
@@ -166,8 +166,8 @@
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
@@ -281,7 +281,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -322,13 +321,14 @@
</group>
<group xsi:type="cluster" name="HDFS_LEAVE_SAFEMODE" title="HDFS - Wait to leave Safemode">
+ <direction>UPGRADE</direction>
<service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <direction>UPGRADE</direction>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -393,8 +393,9 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
+
<priority>
<service>HDFS</service>
<service>YARN</service>
@@ -442,7 +443,8 @@
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Upgrade Oozie Database">
- <task xsi:type="execute" hosts="any" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
@@ -454,7 +456,8 @@
<direction>DOWNGRADE</direction>
<skippable>true</skippable>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Downgrade Oozie ShareLib">
- <task xsi:type="execute" hosts="any" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -527,12 +530,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -809,14 +806,16 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -866,12 +865,14 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -882,12 +883,14 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -900,7 +903,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -911,7 +915,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -924,7 +929,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -937,7 +943,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
index b6c49e9..b9733b6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_server_action_test.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -54,12 +54,21 @@
</execute-stage>
<execute-stage title="Calculating Properties">
- <task xsi:type="server_action" summary="Calculating Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Calculating HDFS Properties">
- <task xsi:type="server_action" summary="Calculating Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
</execute-stage>
</group>
</order>
-</upgrade>
\ No newline at end of file
+
+ <processing>
+ <service name="ZOOKEEPER">
+ <component name="ZOOKEEPER_SERVER">
+ <upgrade />
+ </component>
+ </service>
+ </processing>
+
+</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
index 6dc143a..88bb73e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -46,7 +46,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -121,7 +122,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Save Cluster State" service="" component="">
@@ -155,7 +157,8 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_1_1_nn_pre_upgrade" />
<task xsi:type="manual">
@@ -167,7 +170,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -188,17 +192,21 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_1_1_nm_pre_upgrade"/>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -214,6 +222,7 @@
<task xsi:type="configure" id="hdp_2_1_1_hive_server_conditions"/>
<task xsi:type="configure" id="hdp_2_1_1_hive_server_conditions_skip"/>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -223,12 +232,14 @@
<!-- This is important, do not remove it since UpgradeHelperTest.java :
testUpgradeWithMultipleTasksWithMultipleHostTypes() asserts
that these tasks each run on their own stage. -->
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
index 85736e1..c6d8bbe 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_checks.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -43,7 +43,7 @@
</prerequisite-checks>
<order>
- <group xsi:type="cluster" name="PRE_CLUSTER" title="Pre Upgrade" stage="pre">
+ <group xsi:type="cluster" name="PRE_CLUSTER" title="Pre Upgrade">
<execute-stage title="Confirm 1">
<task xsi:type="manual">
<message>Foo</message>
@@ -51,7 +51,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -113,7 +114,7 @@
</group>
- <group xsi:type="cluster" name="POST_CLUSTER" title="Finalize Upgrade" stage="post">
+ <group xsi:type="cluster" name="POST_CLUSTER" title="Finalize Upgrade">
<execute-stage title="Confirm Finalize">
<task xsi:type="manual">
<message>Please confirm you are ready to finalize</message>
@@ -121,7 +122,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Save Cluster State" service="" component="">
@@ -155,7 +157,8 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_1_1_nn_pre_upgrade"/>
<task xsi:type="manual">
@@ -167,7 +170,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -187,16 +191,20 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
</processing>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
index 9f57ca8..36f8062 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.3</target-stack>
<type>NON_ROLLING</type>
@@ -35,8 +34,9 @@
</prerequisite-checks>
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
+
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Stop YARN Queues">
<task xsi:type="manual">
<message>Before continuing, please stop all YARN queues.</message>
@@ -46,8 +46,9 @@
<group xsi:type="stop" name="Stop High-Level Daemons" title="Stop Daemons for High-Level Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
+
<parallel-scheduler></parallel-scheduler>
<service name="YARN">
@@ -75,8 +76,9 @@
<group xsi:type="stop" name="Stop Low-Level Daemons" title="Stop Daemons for Low-Level Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
+
<parallel-scheduler></parallel-scheduler>
<service name="HDFS">
@@ -126,7 +128,6 @@
<group xsi:type="restart" name="ZOOKEEPER" title="Zookeeper">
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -187,4 +188,13 @@
</execute-stage>
</group>
</order>
-</upgrade>
\ No newline at end of file
+
+ <processing>
+ <service name="ZOOKEEPER">
+ <component name="ZOOKEEPER_SERVER">
+ <upgrade />
+ </component>
+ </service>
+ </processing>
+
+</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml
index 23e8bbc..5d8ef01 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_partial.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -47,7 +47,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -131,7 +132,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Save Cluster State" service="" component="">
@@ -168,7 +170,8 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_1_1_nn_pre_upgrade" />
<task xsi:type="manual">
@@ -180,7 +183,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -201,17 +205,21 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_1_1_nm_pre_upgrade"/>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -225,6 +233,7 @@
<task xsi:type="configure" id="hdp_2_1_1_set_transport_mode"/>
<task xsi:type="configure" id="hdp_2_1_1_hive_server_foo"/>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -234,12 +243,14 @@
<!-- This is important, do not remove it since UpgradeHelperTest.java :
testUpgradeWithMultipleTasksWithMultipleHostTypes() asserts
that these tasks each run on their own stage. -->
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
index bfd994e..91770fb 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_to_new_stack.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.4</target-stack>
<type>ROLLING</type>
@@ -45,7 +45,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -111,7 +112,8 @@
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
@@ -122,7 +124,8 @@
<execute-stage title="Run On All {{version}}">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
</group>
@@ -151,7 +154,8 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_1_1_nn_test"/>
<task xsi:type="manual">
@@ -163,7 +167,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -184,16 +189,20 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -207,6 +216,7 @@
<task xsi:type="configure" id="hdp_2_1_1_test_properties"/>
</pre-upgrade>
+ <upgrade />
</component>
</service>
</processing>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
index 5d41754..021c73a 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xsi:noNamespaceSchemaLocation="upgrade-pack.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<target>2.2.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -45,7 +45,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -136,7 +137,7 @@
<task xsi:type="restart-task" />
</upgrade>
<post-upgrade>
- <task xsi:type="configure" />
+ <task xsi:type="configure" id="foo" />
</post-upgrade>
</component>
</service>
@@ -145,12 +146,10 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
- </task>
- <task xsi:type="configure">
- <type>hdfs-site</type>
- <set key="myproperty" value="mynewvalue"/>
+ <script>foo</script>
+ <function>list</function>
</task>
+ <task xsi:type="configure" id="foo" />
<task xsi:type="manual">
<message>{{direction.verb.proper}} your database</message>
</task>
@@ -160,7 +159,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -181,16 +181,20 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -201,20 +205,8 @@
<summary>HiveServer Port Availability</summary>
<message>The HiveServer port will now change to 10010 if hive is using a binary transfer mode or 10011 if hive is using an http transport mode. You can use "netstat -anp | grep 1001[01]" to determine if the port is available on each of following HiveServer host(s): {{hosts.all}}. If the port is not available, the process using it must be terminated.</message>
</task>
-
- <task xsi:type="configure">
- <condition type="hive-site" key="hive.server2.transport.mode" value="binary">
- <type>hive-site</type>
- <key>hive.server2.thrift.port</key>
- <value>10010</value>
- </condition>
- <condition type="hive-site" key="hive.server2.transport.mode" value="http">
- <type>hive-site</type>
- <key>hive.server2.http.port</key>
- <value>10011</value>
- </condition>
- </task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
</processing>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml
index 4e8e2ea..d1dc62d 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_15388.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*</target>
<target-stack>HDP-2.4.0</target-stack>
<type>ROLLING</type>
@@ -45,7 +45,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -91,8 +92,8 @@
</group>
<group name="SERVICE_CHECK1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -147,7 +148,7 @@
<task xsi:type="restart-task" />
</upgrade>
<post-upgrade>
- <task xsi:type="configure" />
+ <task xsi:type="configure" id="foo" />
</post-upgrade>
</component>
</service>
@@ -156,11 +157,10 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
- <task xsi:type="configure">
- <type>hdfs-site</type>
- <set key="myproperty" value="mynewvalue"/>
+ <task xsi:type="configure" id="foo">
</task>
<task xsi:type="manual">
<message>{{direction.verb.proper}} your database</message>
@@ -171,7 +171,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -192,16 +193,20 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
@@ -212,20 +217,8 @@
<summary>HiveServer Port Availability</summary>
<message>The HiveServer port will now change to 10010 if hive is using a binary transfer mode or 10011 if hive is using an http transport mode. You can use "netstat -anp | grep 1001[01]" to determine if the port is available on each of following HiveServer host(s): {{hosts.all}}. If the port is not available, the process using it must be terminated.</message>
</task>
-
- <task xsi:type="configure">
- <condition type="hive-site" key="hive.server2.transport.mode" value="binary">
- <type>hive-site</type>
- <key>hive.server2.thrift.port</key>
- <value>10010</value>
- </condition>
- <condition type="hive-site" key="hive.server2.transport.mode" value="http">
- <type>hive-site</type>
- <key>hive.server2.http.port</key>
- <value>10011</value>
- </condition>
- </task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
</processing>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
index b56b935..273f619 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2.1</target-stack>
<type>ROLLING</type>
@@ -43,7 +43,7 @@
</prerequisite-checks>
<order>
- <group xsi:type="cluster" name="PRE_CLUSTER" title="Pre Upgrade" stage="pre">
+ <group xsi:type="cluster" name="PRE_CLUSTER" title="Pre Upgrade">
<execute-stage title="Confirm 1">
<task xsi:type="manual">
<message>Foo</message>
@@ -51,7 +51,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -119,7 +120,7 @@
</group>
- <group xsi:type="cluster" name="POST_CLUSTER" title="Finalize Upgrade" stage="post">
+ <group xsi:type="cluster" name="POST_CLUSTER" title="Finalize Upgrade">
<execute-stage title="Confirm Finalize">
<task xsi:type="manual">
<message>Please confirm you are ready to finalize</message>
@@ -127,7 +128,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Execute HDFS Finalize">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Save Cluster State" service="" component="">
@@ -161,7 +163,8 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
<task xsi:type="configure" id="hdp_2_2_0_nn_pre_upgrade"/>
<task xsi:type="manual">
@@ -173,7 +176,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -193,16 +197,20 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
</processing>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
index b2c4b93..dae1c16 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_skip_failures.xml
@@ -15,8 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*</target>
+ <target-stack>HDP-2.2</target-stack>
<skip-failures>true</skip-failures>
<skip-service-check-failures>true</skip-service-check-failures>
<type>ROLLING</type>
@@ -67,7 +68,7 @@
<task xsi:type="restart-task"/>
</upgrade>
<post-upgrade>
- <task xsi:type="configure"/>
+ <task xsi:type="configure" id="foo" />
</post-upgrade>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
index e339399..075cb13 100644
--- a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
+++ b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/services/HDFS/upgrades/HDP/2.2.0/upgrade_test_15388.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -69,6 +69,10 @@
<service name="HBASE">
<component>REGIONSERVER</component>
</service>
+ <batch>
+ <percent>20</percent>
+ <message>Message</message>
+ </batch>
</group>
</order>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml
index 9e935ec..905def5 100644
--- a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml
+++ b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/upgrades/upgrade_test_15388.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*</target>
<target-stack>HDP-2.2.0</target-stack>
<type>ROLLING</type>
@@ -45,7 +45,8 @@
</execute-stage>
<execute-stage service="HDFS" component="NAMENODE" title="Finalize HDFS">
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</execute-stage>
<execute-stage title="Confirm 2">
@@ -91,8 +92,8 @@
</group>
<group name="SERVICE_CHECK1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -147,7 +148,7 @@
<task xsi:type="restart-task" />
</upgrade>
<post-upgrade>
- <task xsi:type="configure" />
+ <task xsi:type="configure" id="foo" />
</post-upgrade>
</component>
</service>
@@ -156,11 +157,10 @@
<component name="NAMENODE">
<pre-upgrade>
<task xsi:type="execute" hosts="master">
- <command>su - {hdfs-user} -c 'dosomething'</command>
+ <script>foo</script>
+ <function>list</function>
</task>
- <task xsi:type="configure">
- <type>hdfs-site</type>
- <set key="myproperty" value="mynewvalue"/>
+ <task xsi:type="configure" id="foo">
</task>
<task xsi:type="manual">
<message>{{direction.verb.proper}} your database</message>
@@ -171,7 +171,8 @@
</upgrade>
<post-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</post-upgrade>
</component>
@@ -192,16 +193,24 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
</component>
<component name="NODEMANAGER">
<pre-upgrade>
<task xsi:type="execute">
- <command>ls</command>
+ <script>foo</script>
+ <function>list</function>
</task>
</pre-upgrade>
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
</component>
</service>
@@ -213,19 +222,10 @@
<message>The HiveServer port will now change to 10010 if hive is using a binary transfer mode or 10011 if hive is using an http transport mode. You can use "netstat -anp | grep 1001[01]" to determine if the port is available on each of following HiveServer host(s): {{hosts.all}}. If the port is not available, the process using it must be terminated.</message>
</task>
- <task xsi:type="configure">
- <condition type="hive-site" key="hive.server2.transport.mode" value="binary">
- <type>hive-site</type>
- <key>hive.server2.thrift.port</key>
- <value>10010</value>
- </condition>
- <condition type="hive-site" key="hive.server2.transport.mode" value="http">
- <type>hive-site</type>
- <key>hive.server2.http.port</key>
- <value>10011</value>
- </condition>
+ <task xsi:type="configure" id="foo" >
</task>
</pre-upgrade>
+ <upgrade />
</component>
</service>
</processing>
[4/4] ambari git commit: AMBARI-18232. Upgrade Execute: add xsd for
upgrade packs (ncole)
Posted by nc...@apache.org.
AMBARI-18232. Upgrade Execute: add xsd for upgrade packs (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ef600f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ef600f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ef600f4
Branch: refs/heads/trunk
Commit: 2ef600f4d7d615d1f87534aa5f26104e1619b86b
Parents: 16e04b2
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Aug 23 14:53:49 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Aug 26 22:41:01 2016 -0400
----------------------------------------------------------------------
.../ambari/server/stack/ExtensionDirectory.java | 24 +-
.../server/stack/ModuleFileUnmarshaller.java | 106 +++++-
.../ambari/server/stack/ServiceDirectory.java | 15 +-
.../ambari/server/stack/StackDirectory.java | 29 +-
.../apache/ambari/server/stack/StackModule.java | 17 +-
.../state/stack/upgrade/ConfigureFunction.java | 19 +-
.../server/state/stack/upgrade/ExecuteTask.java | 7 -
.../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 69 ++--
.../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 42 ++-
.../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 78 ++--
.../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 84 +++--
.../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 40 +-
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 129 ++++---
.../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 139 ++++---
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 53 +--
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 85 +++--
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 109 +++---
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 55 ++-
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 86 +++--
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 141 ++++---
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 54 +--
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 103 ++++--
.../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 52 ++-
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 136 ++++---
.../resources/stacks/HDP/2.5/repos/repoinfo.xml | 5 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 53 +--
.../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 52 ++-
.../src/main/resources/upgrade-pack.xsd | 363 +++++++++++++++++++
.../server/state/stack/UpgradePackTest.java | 62 ++++
.../upgrades/HDP/2.2.0/upgrade_test_15388.xml | 7 +-
.../HDP/2.1.1/upgrades/upgrade_bucket_test.xml | 22 +-
.../HDP/2.1.1/upgrades/upgrade_direction.xml | 4 +-
.../2.1.1/upgrades/upgrade_grouping_rolling.xml | 6 +-
.../upgrades/upgrade_nonrolling_new_stack.xml | 57 +--
.../upgrades/upgrade_server_action_test.xml | 17 +-
.../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 29 +-
.../HDP/2.1.1/upgrades/upgrade_test_checks.xml | 26 +-
.../2.1.1/upgrades/upgrade_test_nonrolling.xml | 24 +-
.../HDP/2.1.1/upgrades/upgrade_test_partial.xml | 29 +-
.../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml | 26 +-
.../stacks/HDP/2.2.0/upgrades/upgrade_test.xml | 40 +-
.../HDP/2.2.0/upgrades/upgrade_test_15388.xml | 41 +--
.../HDP/2.2.0/upgrades/upgrade_test_checks.xml | 26 +-
.../upgrades/upgrade_test_skip_failures.xml | 5 +-
.../upgrades/HDP/2.2.0/upgrade_test_15388.xml | 6 +-
.../HDP/2.2.0/upgrades/upgrade_test_15388.xml | 44 +--
46 files changed, 1761 insertions(+), 855 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
index f2647fd..7b31925 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
@@ -18,29 +18,17 @@
package org.apache.ambari.server.stack;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
-import org.apache.ambari.server.state.stack.RepositoryXml;
-import org.apache.ambari.server.state.stack.StackRoleCommandOrder;
-import org.apache.ambari.server.state.stack.UpgradePack;
-import org.apache.commons.io.FilenameUtils;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.xml.bind.JAXBException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
/**
* Encapsulates IO operations on a extension definition extension directory.
*
@@ -150,7 +138,7 @@ public class ExtensionDirectory extends StackDefinitionDirectory {
try {
metaInfoXml = unmarshaller.unmarshal(ExtensionMetainfoXml.class, extensionMetaInfoFile);
- } catch (JAXBException e) {
+ } catch (Exception e) {
metaInfoXml = new ExtensionMetainfoXml();
metaInfoXml.setValid(false);
metaInfoXml.addError("Unable to parse extension metainfo.xml file at location: " +
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java
index 7d47339..d76d59f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ModuleFileUnmarshaller.java
@@ -18,6 +18,25 @@
package org.apache.ambari.server.stack;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.XMLConstants;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
import org.apache.ambari.server.state.stack.ConfigUpgradePack;
import org.apache.ambari.server.state.stack.ConfigurationXml;
import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
@@ -25,25 +44,25 @@ import org.apache.ambari.server.state.stack.RepositoryXml;
import org.apache.ambari.server.state.stack.ServiceMetainfoXml;
import org.apache.ambari.server.state.stack.StackMetainfoXml;
import org.apache.ambari.server.state.stack.UpgradePack;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
/**
* Provides functionality to unmarshal stack definition files to their
* corresponding object representations.
*/
-class ModuleFileUnmarshaller {
+public class ModuleFileUnmarshaller {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ModuleFileUnmarshaller.class);
+
/**
* Map of class to JAXB context
*/
- private static final Map<Class<?>, JAXBContext> jaxbContexts = new HashMap<Class<?>, JAXBContext>();
+ private static final Map<Class<?>, JAXBContext> jaxbContexts = new HashMap<>();
+ private static final Map<String, Schema> jaxbSchemas = new HashMap<>();
+
/**
* Unmarshal a file to it's corresponding object type.
@@ -53,11 +72,70 @@ class ModuleFileUnmarshaller {
*
* @return object representation of the specified file
* @throws JAXBException if unable to unmarshal the file
+ * @throws XMLStreamException
+ * @throws SAXException
+ * @throws FileNotFoundException
+ */
+ public <T> T unmarshal(Class<T> clz, File file) throws JAXBException, IOException, XMLStreamException, SAXException {
+ return unmarshal(clz, file, false);
+ }
+
+ /**
+ * Unmarshal a file to it's corresponding object type.
+ *
+ * @param clz class of the object representation
+ * @param file file to unmarshal
+ * @param logXsd log XSD information
+ *
+ * @return object representation of the specified file
+ * @throws JAXBException if unable to unmarshal the file
+ * @throws XMLStreamException
+ * @throws SAXException
+ * @throws FileNotFoundException
*/
- public <T> T unmarshal(Class<T> clz, File file) throws JAXBException {
+ public <T> T unmarshal(Class<T> clz, File file, boolean logXsd) throws JAXBException, IOException, XMLStreamException, SAXException {
Unmarshaller u = jaxbContexts.get(clz).createUnmarshaller();
- return clz.cast(u.unmarshal(file));
+ XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
+
+ FileReader reader = new FileReader(file);
+ XMLStreamReader xmlReader = xmlFactory.createXMLStreamReader(reader);
+
+ xmlReader.nextTag();
+ String xsdName = xmlReader.getAttributeValue(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "noNamespaceSchemaLocation");
+
+ InputStream xsdStream = null;
+
+ if (null != xsdName) {
+ if (logXsd) {
+ LOG.info("Processing " + file.getAbsolutePath() + " with " + xsdName);
+ }
+ if (jaxbSchemas.containsKey(xsdName)) {
+ u.setSchema(jaxbSchemas.get(xsdName));
+ } else {
+
+ xsdStream = clz.getClassLoader().getResourceAsStream(xsdName);
+
+ if (null != xsdStream) {
+ SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = factory.newSchema(new StreamSource(xsdStream));
+
+ u.setSchema(schema);
+
+ jaxbSchemas.put(xsdName, schema);
+ } else if (logXsd) {
+ LOG.info("Schema '" + xsdName + "' for " + file.getAbsolutePath() + " was not found, ignoring");
+ }
+ }
+ } else if (logXsd) {
+ LOG.info("NOT processing " + file.getAbsolutePath() + "; there is no XSD");
+ }
+
+ try {
+ return clz.cast(u.unmarshal(file));
+ } finally {
+ IOUtils.closeQuietly(xsdStream);
+ }
}
/**
@@ -65,7 +143,7 @@ class ModuleFileUnmarshaller {
*/
static {
try {
- // three classes define the top-level element "metainfo", so we need 3 contexts.
+ // three classes define the top-level element "metainfo", so we need 3 contexts for them
JAXBContext ctx = JAXBContext.newInstance(StackMetainfoXml.class, RepositoryXml.class,
ConfigurationXml.class, UpgradePack.class, ConfigUpgradePack.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
index e938e68..30663a3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
@@ -18,6 +18,11 @@
package org.apache.ambari.server.stack;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.state.ServiceInfo;
@@ -28,14 +33,6 @@ import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.xml.bind.JAXBException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Encapsulates IO operations on a stack definition service directory.
*/
@@ -290,7 +287,7 @@ public abstract class ServiceDirectory extends StackDefinitionDirectory {
try {
metaInfoXml = unmarshaller.unmarshal(ServiceMetainfoXml.class, f);
- } catch (JAXBException e) {
+ } catch (Exception e) {
metaInfoXml = new ServiceMetainfoXml();
metaInfoXml.setValid(false);
String msg = String.format("Unable to parse service metainfo.xml file '%s' ", f.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
index bfba021..3acc617 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
@@ -18,12 +18,20 @@
package org.apache.ambari.server.stack;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
+import org.apache.ambari.server.state.stack.ConfigUpgradePack;
import org.apache.ambari.server.state.stack.RepositoryXml;
import org.apache.ambari.server.state.stack.StackMetainfoXml;
import org.apache.ambari.server.state.stack.StackRoleCommandOrder;
-import org.apache.ambari.server.state.stack.ConfigUpgradePack;
import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.commons.io.FilenameUtils;
import org.codehaus.jackson.map.ObjectMapper;
@@ -31,17 +39,6 @@ import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.xml.bind.JAXBException;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
/**
* Encapsulates IO operations on a stack definition stack directory.
*/
@@ -331,7 +328,7 @@ public class StackDirectory extends StackDefinitionDirectory {
if (repositoryFile.exists()) {
try {
repoFile = unmarshaller.unmarshal(RepositoryXml.class, repositoryFile);
- } catch (JAXBException e) {
+ } catch (Exception e) {
repoFile = new RepositoryXml();
repoFile.setValid(false);
String msg = "Unable to parse repo file at location: " +
@@ -367,7 +364,7 @@ public class StackDirectory extends StackDefinitionDirectory {
try {
metaInfoXml = unmarshaller.unmarshal(StackMetainfoXml.class, stackMetaInfoFile);
- } catch (JAXBException e) {
+ } catch (Exception e) {
metaInfoXml = new StackMetainfoXml();
metaInfoXml.setValid(false);
String msg = "Unable to parse stack metainfo.xml file at location: " +
@@ -468,7 +465,7 @@ public class StackDirectory extends StackDefinitionDirectory {
pack = unmarshaller.unmarshal(UpgradePack.class, upgradeFile);
pack.setName(packName);
}
- catch (JAXBException e) {
+ catch (Exception e) {
if (upgradeFile == null) {
throw new AmbariException("Null upgrade pack");
}
@@ -482,7 +479,7 @@ public class StackDirectory extends StackDefinitionDirectory {
try {
pack = unmarshaller.unmarshal(ConfigUpgradePack.class, upgradeFile);
}
- catch (JAXBException e) {
+ catch (Exception e) {
if (upgradeFile == null) {
throw new AmbariException("Null config upgrade pack");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
index 0606f2a..23b0218 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
@@ -19,7 +19,6 @@
package org.apache.ambari.server.stack;
import java.io.File;
-import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -27,14 +26,10 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
-import javax.xml.bind.JAXBException;
-
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
-import org.apache.ambari.server.stack.StackDefinitionDirectory;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.ExtensionInfo;
import org.apache.ambari.server.state.PropertyDependencyInfo;
@@ -47,11 +42,7 @@ import org.apache.ambari.server.state.stack.RepositoryXml;
import org.apache.ambari.server.state.stack.ServiceMetainfoXml;
import org.apache.ambari.server.state.stack.StackMetainfoXml;
import org.apache.ambari.server.state.stack.UpgradePack;
-import org.apache.ambari.server.state.stack.UpgradePack.OrderService;
-import org.apache.ambari.server.state.stack.upgrade.ClusterGrouping;
import org.apache.ambari.server.state.stack.upgrade.Grouping;
-import org.apache.ambari.server.state.stack.upgrade.ServiceCheckGrouping;
-import org.apache.ambari.server.state.stack.upgrade.ClusterGrouping.ExecuteStage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -857,7 +848,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
ConfigUpgradePack serviceConfigPack = unmarshaller.unmarshal(ConfigUpgradePack.class, serviceConfig);
pack.services.addAll(serviceConfigPack.services);
}
- catch (JAXBException e) {
+ catch (Exception e) {
throw new AmbariException("Unable to parse service config upgrade file at location: " + serviceConfig.getAbsolutePath(), e);
}
}
@@ -897,8 +888,8 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
throw new AmbariException("Expected class: " + first.getClass() + " instead of " + group.getClass());
}
/* If the current group doesn't specify an "after entry" and the first group does
- then the current group should be added first. The first group in the list should
- never be ordered relative to any other group. */
+ then the current group should be added first. The first group in the list should
+ never be ordered relative to any other group. */
if (group.addAfterGroupEntry == null && first.addAfterGroupEntry != null) {
list.add(0, group);
}
@@ -1006,7 +997,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
try {
pack = unmarshaller.unmarshal(UpgradePack.class, serviceFile);
}
- catch (JAXBException e) {
+ catch (Exception e) {
throw new AmbariException("Unable to parse service upgrade file at location: " + serviceFile.getAbsolutePath(), e);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureFunction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureFunction.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureFunction.java
index 086551e..075516f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureFunction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureFunction.java
@@ -17,11 +17,12 @@
*/
package org.apache.ambari.server.state.stack.upgrade;
- import javax.xml.bind.annotation.XmlAccessType;
- import javax.xml.bind.annotation.XmlAccessorType;
- import javax.xml.bind.annotation.XmlRootElement;
- import javax.xml.bind.annotation.XmlTransient;
- import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
/**
* Used to represent Configuring of a component.
@@ -36,6 +37,14 @@ public class ConfigureFunction extends Task {
public static final String actionVerb = "Configuring";
+ /**
+ * The hosts to run the task on. Default to running on
+ * {@link ExecuteHostType#ALL}.
+ */
+ @XmlAttribute
+ public ExecuteHostType hosts = ExecuteHostType.ALL;
+
+
@Override
public Task.Type getType() {
return type;
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
index d175a13..3995cb6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
@@ -59,13 +59,6 @@ public class ExecuteTask extends Task {
@XmlElement(name="function")
public String function;
- /**
- * Command to run under normal conditions.
- * If both a function and command are defined, only the function will be executed.
- */
- @XmlElement(name="command")
- public String command;
-
public static final String actionVerb = "Executing";
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
index 94c5c46..8cba53f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
@@ -17,11 +17,12 @@
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.3.*.*</target>
<target-stack>HDP-2.3</target-stack>
- <type>NON_ROLLING</type>
<downgrade-allowed>false</downgrade-allowed>
+ <type>NON_ROLLING</type>
+
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.StormRestAPIDeletedCheck</check>
@@ -67,9 +68,9 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="FLUME">
@@ -142,9 +143,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -250,7 +251,9 @@
</execute-stage>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<execute-stage service="YARN" component="APP_TIMELINE_SERVER" title="Apply config changes for AppTimelineServer">
@@ -278,7 +281,9 @@
</execute-stage>
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties">
- <task xsi:type="server_action" summary="Calculating Yarn Properties" class="org.apache.ambari.server.serveraction.upgrades.YarnConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.YarnConfigCalculation">
+ <summary>Calculating Yarn Properties</summary>
+ </task>
</execute-stage>
<!--HBASE-->
@@ -287,7 +292,9 @@
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Calculating HBase Properties">
- <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation">
+ <summary>Calculating HBase Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBase Master">
@@ -308,12 +315,16 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!--HIVE-->
<execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server">
- <task xsi:type="server_action" summary="Calculating ZooKeeper Quorum Properties for Hive" class="org.apache.ambari.server.serveraction.upgrades.HiveZKQuorumConfigAction" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveZKQuorumConfigAction">
+ <summary>Calculating ZooKeeper Quorum Properties for Hive</summary>
+ </task>
</execute-stage>
<execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server">
@@ -346,7 +357,9 @@
</execute-stage>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<!--FALCON-->
@@ -375,7 +388,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -410,7 +422,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -475,8 +488,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -532,8 +545,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>OOZIE</service>
@@ -571,11 +584,6 @@
<component>DRPC_SERVER</component>
</service>
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="FLUME" title="Flume">
@@ -588,8 +596,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>STORM</service>
@@ -824,14 +832,16 @@
-->
<task xsi:type="configure_function"/>
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -865,12 +875,14 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -883,7 +895,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -896,7 +909,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -909,7 +923,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
index d0bfec2..5aee3a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
<target-stack>HDP-2.2</target-stack>
<type>NON_ROLLING</type>
@@ -63,8 +62,8 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
@@ -155,10 +154,10 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="HBASE">
<component>HBASE_REGIONSERVER</component>
@@ -223,7 +222,9 @@
<skippable>true</skippable> <!-- May fix configuration problems manually -->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez">
@@ -231,11 +232,15 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
</group>
@@ -263,7 +268,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -309,7 +313,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -374,8 +379,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -451,8 +456,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -507,12 +512,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -534,8 +533,9 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
+
<priority>
<service>FALCON</service>
<service>KAFKA</service>
@@ -775,14 +775,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
index 3168f10..66ef30e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.3.*.*</target>
<target-stack>HDP-2.3</target-stack>
<type>NON_ROLLING</type>
@@ -66,9 +65,9 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="FLUME">
@@ -166,8 +165,8 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
@@ -268,7 +267,9 @@
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties">
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes for Ranger">
@@ -334,7 +335,9 @@
</execute-stage>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<execute-stage service="YARN" component="APP_TIMELINE_SERVER" title="Apply config changes for AppTimelineServer">
@@ -376,7 +379,9 @@
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Calculating HBase Properties">
- <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation">
+ <summary>Calculating HBase Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBase Master">
@@ -427,7 +432,9 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!--HIVE-->
@@ -473,7 +480,9 @@
</execute-stage>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<!--KNOX-->
@@ -546,7 +555,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -592,7 +600,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -657,8 +666,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -734,8 +743,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -791,11 +800,6 @@
<component>DRPC_SERVER</component>
</service>
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -831,8 +835,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KAFKA</service>
@@ -900,14 +904,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -1093,14 +1099,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -1150,12 +1158,14 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1166,12 +1176,14 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1184,7 +1196,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1195,7 +1208,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1208,7 +1222,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1221,7 +1236,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
index 0f15286..2d921a2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
<type>NON_ROLLING</type>
@@ -72,11 +71,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="ATLAS">
<component>ATLAS_SERVER</component>
@@ -178,8 +176,8 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
@@ -282,7 +280,9 @@
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties">
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes for Ranger">
@@ -348,7 +348,9 @@
</execute-stage>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<execute-stage service="YARN" component="APP_TIMELINE_SERVER" title="Apply config changes for AppTimelineServer">
@@ -376,7 +378,9 @@
</execute-stage>
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark Shuffle">
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark</summary>
+ </task>
</execute-stage>
<!--HBASE-->
@@ -393,7 +397,9 @@
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Calculating HBase Properties">
- <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation">
+ <summary>Calculating HBase Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for HBase Master">
@@ -444,7 +450,9 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!--HIVE-->
@@ -494,7 +502,9 @@
</execute-stage>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<!--KNOX-->
@@ -568,7 +578,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -615,7 +624,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -685,8 +695,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -773,8 +783,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -829,12 +839,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -870,8 +874,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KAFKA</service>
@@ -940,14 +944,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -1152,14 +1158,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -1209,12 +1217,14 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1225,12 +1235,14 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1243,7 +1255,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1254,7 +1267,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1267,7 +1281,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1280,7 +1295,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 9f0f421..6920b2c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -16,12 +16,11 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.2.*.*</target>
+ <target-stack>HDP-2.2</target-stack>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
- <target-stack>HDP-2.2</target-stack>
<type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
@@ -133,8 +132,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -148,8 +147,9 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
+
<service name="HDFS">
<component>DATANODE</component>
</service>
@@ -164,14 +164,14 @@
<batch>
<percent>20</percent>
- <summary>Verification Required</summary>
+ <summary>Verification Required</summary>
<message>The initial batch of {{components}} hosts have been {{direction.past}}. You are advised to check the hosts and perform cluster/workload-specific tests against your cluster to ensure proper operation before proceeding with {{direction.text}} of the remaining services.</message>
</batch>
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -281,8 +281,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -450,7 +450,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -509,7 +511,9 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_2_0_0_tez_client_adjust_tez_lib_uris_property" />
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task"/>
@@ -607,29 +611,35 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 41b516a..1b04237 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
@@ -15,9 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.3.*.*</target>
<target-stack>HDP-2.3</target-stack>
+ <skip-failures>false</skip-failures>
+ <skip-service-check-failures>false</skip-service-check-failures>
<type>ROLLING</type>
<prerequisite-checks>
@@ -44,9 +47,6 @@
</configuration>
</prerequisite-checks>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -164,8 +164,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -180,8 +180,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
</service>
@@ -202,8 +202,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -315,8 +315,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -444,9 +444,9 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -456,7 +456,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_env"/>
<task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin"/>
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync"/>
@@ -477,19 +479,23 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -505,7 +511,6 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_namenode_ha_adjustments"/>
@@ -523,6 +528,8 @@
<task xsi:type="configure" id="hdp_2_3_0_0_hdfs_ranger_hdfs_delete_old_properties"/>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -555,11 +562,12 @@
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_mapreduce2_adjust_history_server"/>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -567,7 +575,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -578,19 +588,19 @@
<service name="YARN">
<component name="APP_TIMELINE_SERVER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_ats_enable_recovery"/>
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_keep_ats_v1"/>
</pre-upgrade>
-
+
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
</component>
<component name="RESOURCEMANAGER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_rm_disable_node_labels"/>
@@ -601,6 +611,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_rm_check_cs_root_max_capacity"/>
</pre-upgrade>
+
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -621,7 +634,6 @@
<service name="HBASE">
<component name="HBASE_MASTER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_adjust_phoenix_scheduler_factory"/>
@@ -629,7 +641,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_set_global_memstore_size"/>
- <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation">
+ <summary>Calculating HBase Properties</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_adjust_phoenix_indexed_wal_edit_codec"/>
@@ -646,6 +660,8 @@
<!-- These HBASE configs changed in HDP 2.3.4.0, but Ambari can't distinguish HDP 2.3.2.0 vs HDP 2.3.4.0, so easier to always do them. -->
<task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/>
</pre-upgrade>
+
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<upgrade>
<task xsi:type="restart-task"/>
@@ -672,7 +688,9 @@
<task xsi:type="configure" id="hdp_2_2_0_0_tez_client_adjust_tez_counters_properties"/>
<task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/>
<task xsi:type="configure" id="hdp_2_3_0_0_tez_keep_ats_v1"/>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task"/>
@@ -786,9 +804,12 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -796,19 +817,22 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -844,7 +868,8 @@
<!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers, running a migration script,
and then starting one at a time. This is needed during both upgrade and downgrade. -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers">
+ <task xsi:type="execute" hosts="all">
+ <summary>Shut down all Kafka Brokers</summary>
<script>scripts/kafka_broker.py</script>
<function>stop</function>
</task>
@@ -857,7 +882,6 @@
<service name="KNOX">
<component name="KNOX_GATEWAY">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_knox_configure_ranger_policy"/>
@@ -865,6 +889,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_knox_remove_deprecated_ranger_properties"/>
</pre-upgrade>
+
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -873,29 +900,20 @@
<service name="STORM">
<component name="NIMBUS">
- <pre-downgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
- <script>scripts/storm_upgrade.py</script>
- <function>delete_storm_zookeeper_data</function>
- </task>
-
- <task xsi:type="execute" summary="Removing local Storm data">
- <script>scripts/storm_upgrade.py</script>
- <function>delete_storm_local_data</function>
- </task>
- </pre-downgrade>
<pre-upgrade>
<task xsi:type="manual">
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -916,6 +934,21 @@
<task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
</pre-upgrade>
+
+ <pre-downgrade>
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
+ <script>scripts/storm_upgrade.py</script>
+ <function>delete_storm_zookeeper_data</function>
+ </task>
+
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
+ <script>scripts/storm_upgrade.py</script>
+ <function>delete_storm_local_data</function>
+ </task>
+ </pre-downgrade>
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -923,7 +956,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -934,7 +968,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -947,7 +982,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -960,7 +996,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
[2/4] ambari git commit: AMBARI-18232. Upgrade Execute: add xsd for
upgrade packs (ncole)
Posted by nc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index 09bd2ac..27f2010 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -16,14 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
-
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -50,9 +48,6 @@
</configuration>
</prerequisite-checks>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<!-- Instructs the upgrade pack how to build the configuration pack -->
<upgrade-path>
<intermediate-stack version="2.4"/>
@@ -154,7 +149,9 @@
<skippable>true</skippable>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Update HBase Configuration">
- <task xsi:type="server_action" summary="Update HBase Env Configuration" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction">
+ <summary>Update HBase Env Configuration</summary>
+ </task>
</execute-stage>
</group>
@@ -167,15 +164,17 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
</group>
<!-- This needs to be done for every Rolling Upgrade pack that changes configurations. -->
<group xsi:type="cluster" name="CONFIGURE_CLIENT_DEPENDENCIES" title="Write client configs">
+ <direction>UPGRADE</direction>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <direction>UPGRADE</direction>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Write Mapreduce2 Client configs">
<task xsi:type="execute">
@@ -220,8 +219,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -236,8 +235,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -260,8 +259,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -378,8 +377,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -413,8 +412,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -435,8 +434,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>DOWNGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -545,9 +544,9 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -558,27 +557,35 @@
<task xsi:type="configure" id="hdp_2_5_0_0_remove_sso_property" />
<task xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"/>
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
<task xsi:type="execute" hosts="all">
<script>scripts/ranger_admin.py</script>
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -597,14 +604,16 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db" />
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -618,13 +627,13 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
-
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -672,7 +681,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -692,7 +703,9 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" />
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
@@ -819,7 +832,9 @@
<!-- Remove Atlas configs that were incorrectly added to hive-site instead of Atlas' application.properties. -->
<task xsi:type="configure" id="hdp_2_5_0_0_remove_hive_atlas_configs" />
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
</pre-upgrade>
<pre-downgrade>
@@ -869,31 +884,37 @@
<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"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</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"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
</component>
<component name="SPARK_CLIENT">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_remove_spark_properties_extraJavaOptions"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -905,9 +926,12 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -915,21 +939,25 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
- <task xsi:type="server_action" summary="Fixing Oozie admin users"
- class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fixing Oozie admin users</summary>
+ </task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -965,10 +993,11 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
- <pre-downgrade/>
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
</pre-upgrade>
+
+ <pre-downgrade/>
<upgrade>
<task xsi:type="restart-task" />
@@ -978,10 +1007,11 @@
<service name="KNOX">
<component name="KNOX_GATEWAY">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db" />
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<upgrade>
<task xsi:type="restart-task" />
@@ -994,20 +1024,23 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" />
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
<!-- Remove Atlas configs that were incorrectly added to storm-site instead of Atlas' application.properties. -->
<task xsi:type="configure" id="hdp_2_5_0_0_remove_storm_atlas_configs" />
<task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1015,12 +1048,14 @@
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1033,14 +1068,16 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1053,7 +1090,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1066,7 +1104,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
index 750f934..9622031 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml
@@ -16,9 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <target>2.4.*.*</target>
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd"> <target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
<type>NON_ROLLING</type>
<prerequisite-checks>
@@ -63,10 +61,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -169,9 +167,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -254,12 +252,16 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez">
@@ -268,7 +270,9 @@
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus">
@@ -300,7 +304,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -357,7 +360,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -436,8 +440,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -516,8 +520,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -563,12 +567,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -604,8 +602,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -673,14 +671,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -702,14 +702,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -921,14 +923,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
index 6f9372e..4df5fef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml
@@ -16,22 +16,22 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
<type>NON_ROLLING</type>
<prerequisite-checks>
<check>org.apache.ambari.server.checks.RangerAuditDbCheck</check>
+ <check>org.apache.ambari.server.checks.AtlasPresenceCheck</check>
+
<configuration>
<!-- Configuration properties for all pre-reqs including required pre-reqs -->
<check-properties name="org.apache.ambari.server.checks.HiveDynamicServiceDiscoveryCheck">
<property name="min-failure-stack-version">HDP-2.3.0.0</property>
</check-properties>
</configuration>
-
- <check>org.apache.ambari.server.checks.AtlasPresenceCheck</check>
</prerequisite-checks>
+
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -66,10 +66,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -172,9 +172,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -257,7 +257,9 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!-- YARN -->
@@ -272,7 +274,9 @@
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes for Tez">
@@ -281,8 +285,12 @@
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
- <task xsi:type="server_action" summary="Fix oozie admin users" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fix oozie admin users</summary>
+ </task>
</execute-stage>
@@ -313,11 +321,15 @@
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties">
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Configuring Ranger Alerts">
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
</execute-stage>
<!-- HDFS -->
@@ -352,7 +364,9 @@
</execute-stage>
<execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server">
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
</execute-stage>
<!-- HBASE -->
@@ -374,8 +388,9 @@
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus in KerberosDescriptor">
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
@@ -425,7 +440,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -482,7 +496,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -561,8 +576,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -641,8 +656,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>OOZIE</service>
@@ -688,12 +703,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -729,8 +738,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -798,14 +807,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -827,14 +838,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -1046,14 +1059,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -1095,24 +1110,28 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1125,7 +1144,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1136,7 +1156,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1149,7 +1170,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1162,7 +1184,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
index abf2db3..17d7d9c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml
@@ -16,13 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -164,8 +163,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -180,8 +179,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -204,8 +203,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -321,8 +320,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -445,7 +444,8 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -455,14 +455,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -484,14 +486,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -566,7 +570,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -632,7 +638,9 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_tez_client_adjust_tez_lib_uris_property"/>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task" />
@@ -735,29 +743,35 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index f20ad06..b8c51f5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -16,14 +16,13 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
-
+ <type>ROLLING</type>
+
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -50,9 +49,6 @@
</configuration>
</prerequisite-checks>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -153,15 +149,17 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
</group>
<!-- This needs to be done for every Rolling Upgrade pack that changes configurations. -->
<group xsi:type="cluster" name="CONFIGURE_CLIENT_DEPENDENCIES" title="Write client configs">
+ <direction>UPGRADE</direction>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <direction>UPGRADE</direction>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Write Mapreduce2 Client configs">
<task xsi:type="execute">
@@ -206,8 +204,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -222,8 +220,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -246,8 +244,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -364,8 +362,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -399,8 +397,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>UPGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -421,8 +419,8 @@
<group xsi:type="stop" name="STOP_STORM" title="Stop Storm Services">
<direction>DOWNGRADE</direction>
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="STORM">
<component>NIMBUS</component>
<component>SUPERVISOR</component>
@@ -531,9 +529,9 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -544,27 +542,35 @@
<task xsi:type="configure" id="hdp_2_5_0_0_remove_sso_property" />
<task xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"/>
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
<task xsi:type="execute" hosts="all">
<script>scripts/ranger_admin.py</script>
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -583,14 +589,16 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db" />
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -604,11 +612,12 @@
<service name="KAFKA">
<component name="KAFKA_BROKER">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -617,13 +626,13 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
-
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_namenode_ha_adjustments"/>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -671,7 +680,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -691,7 +702,9 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" />
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
@@ -722,10 +735,11 @@
<service name="HBASE">
<component name="HBASE_MASTER">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db" />
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<upgrade>
<task xsi:type="restart-task" />
@@ -804,7 +818,9 @@
<component name="HIVE_SERVER">
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" />
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
<task xsi:type="manual">
<summary>HiveServer Port Availability</summary>
@@ -878,9 +894,12 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -888,21 +907,25 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
- <task xsi:type="server_action" summary="Fixing Oozie admin users"
- class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fixing Oozie admin users</summary>
+ </task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -938,11 +961,12 @@
<service name="KNOX">
<component name="KNOX_GATEWAY">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db" />
</pre-upgrade>
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -954,18 +978,21 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" />
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
<!-- Remove Atlas configs that were incorrectly added to storm-site instead of Atlas' application.properties. -->
<task xsi:type="configure" id="hdp_2_5_0_0_remove_storm_atlas_configs" />
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -974,12 +1001,14 @@
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -992,14 +1021,16 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1012,7 +1043,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1025,21 +1057,23 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+
<post-upgrade>
<task xsi:type="manual">
<message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
</task>
</post-upgrade>
- <upgrade>
- <task xsi:type="restart-task" />
- </upgrade>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
index ad8cfd4..0e83e65 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/repos/repoinfo.xml
@@ -28,6 +28,11 @@
<repoid>HDP-UTILS-1.1.0.21</repoid>
<reponame>HDP-UTILS</reponame>
</repo>
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/ambari/centos6/2.x/BUILDS/2.4.0.0-1139</baseurl>
+ <repoid>AMBARI-FOO</repoid>
+ <reponame>AMBARI-FOO</reponame>
+ </repo>
</os>
<os family="redhat7">
<repo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
index cbab386..0b6f762 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
<type>NON_ROLLING</type>
@@ -63,10 +62,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="ATLAS">
<component>ATLAS_SERVER</component>
@@ -185,9 +184,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -276,17 +275,23 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
@@ -318,7 +323,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -376,7 +380,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -455,8 +460,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -578,8 +583,8 @@
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -626,12 +631,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="FLUME" title="Flume">
@@ -658,8 +657,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -726,14 +725,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -761,14 +762,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -999,14 +1002,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
index 60e81c0..49e9d87 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml
@@ -16,13 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
<check>org.apache.ambari.server.checks.HiveMultipleMetastoreCheck</check>
@@ -171,8 +170,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -187,8 +186,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -211,8 +210,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -365,8 +364,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -482,7 +481,8 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -492,14 +492,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -527,14 +529,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -609,7 +613,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -673,7 +679,9 @@
<service name="TEZ">
<component name="TEZ_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task" />
@@ -795,29 +803,35 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
[3/4] ambari git commit: AMBARI-18232. Upgrade Execute: add xsd for
upgrade packs (ncole)
Posted by nc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
index 4a704ad..8c5f9aa 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.4.xml
@@ -15,9 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
+ <skip-failures>false</skip-failures>
+ <skip-service-check-failures>false</skip-service-check-failures>
<type>ROLLING</type>
<prerequisite-checks>
@@ -49,9 +52,6 @@
<intermediate-stack version="2.3"/>
</upgrade-path>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -169,8 +169,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -185,8 +185,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
</service>
@@ -207,8 +207,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -320,8 +320,8 @@
</group>
<group name="SERVICE_CHECK" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -449,9 +449,9 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -460,7 +460,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_env"/>
<task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin"/>
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync"/>
@@ -481,19 +483,23 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -509,24 +515,18 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
-
<task xsi:type="configure" id="hdp_2_3_0_0_namenode_ha_adjustments"/>
-
<task xsi:type="configure" id="hdp_2_3_0_0_modify_hadoop_env"/>
-
<task xsi:type="configure" id="hdp_2_3_0_0_hdfs_adjust_ranger_plugin"/>
-
<task xsi:type="configure" id="hdp_2_3_0_0_hdfs_transition_ranger_hdfs_policy"/>
-
<task xsi:type="configure" id="hdp_2_3_0_0_hdfs_transition_ranger_hdfs_audit"/>
-
<task xsi:type="configure" id="hdp_2_3_0_0_hdfs_transition_ranger_hdfs_security"/>
-
<task xsi:type="configure" id="hdp_2_3_0_0_hdfs_ranger_hdfs_delete_old_properties"/>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -559,11 +559,12 @@
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_mapreduce2_adjust_history_server"/>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -571,7 +572,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -582,19 +585,19 @@
<service name="YARN">
<component name="APP_TIMELINE_SERVER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_ats_enable_recovery"/>
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_keep_ats_v1"/>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
</component>
<component name="RESOURCEMANAGER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_rm_disable_node_labels"/>
@@ -604,8 +607,13 @@
<task xsi:type="configure" id="hdp_2_3_0_0_yarn_rm_check_cs_root_max_capacity"/>
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
</pre-upgrade>
+
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -626,7 +634,6 @@
<service name="HBASE">
<component name="HBASE_MASTER">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_adjust_phoenix_scheduler_factory"/>
@@ -634,7 +641,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_set_global_memstore_size"/>
- <task xsi:type="server_action" summary="Calculating HBase Properties" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseConfigCalculation">
+ <summary>Calculating HBase Properties</summary>
+ </task>
<task xsi:type="configure" id="hdp_2_3_0_0_hbase_master_adjust_phoenix_indexed_wal_edit_codec"/>
@@ -652,6 +661,8 @@
<task xsi:type="configure" id="hdp_2_3_4_0_hbase_remove_local_indexing"/>
</pre-upgrade>
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -682,8 +693,11 @@
<task xsi:type="configure" id="hdp_2_3_0_0_tez_keep_ats_v1"/>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -798,9 +812,12 @@
<task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
<task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -808,19 +825,22 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -856,7 +876,8 @@
<!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers, running a migration script,
and then starting one at a time. This is needed during both upgrade and downgrade. -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers">
+ <task xsi:type="execute" hosts="all">
+ <summary>Shut down all Kafka Brokers</summary>
<script>scripts/kafka_broker.py</script>
<function>stop</function>
</task>
@@ -869,7 +890,6 @@
<service name="KNOX">
<component name="KNOX_GATEWAY">
- <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_knox_configure_ranger_policy"/>
@@ -877,6 +897,9 @@
<task xsi:type="configure" id="hdp_2_3_0_0_knox_remove_deprecated_ranger_properties"/>
</pre-upgrade>
+
+ <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -885,29 +908,20 @@
<service name="STORM">
<component name="NIMBUS">
- <pre-downgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
- <script>scripts/storm_upgrade.py</script>
- <function>delete_storm_zookeeper_data</function>
- </task>
-
- <task xsi:type="execute" summary="Removing local Storm data">
- <script>scripts/storm_upgrade.py</script>
- <function>delete_storm_local_data</function>
- </task>
- </pre-downgrade>
<pre-upgrade>
<task xsi:type="manual">
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -928,6 +942,21 @@
<task xsi:type="configure" id="hdp_2_3_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/>
</pre-upgrade>
+
+ <pre-downgrade>
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
+ <script>scripts/storm_upgrade.py</script>
+ <function>delete_storm_zookeeper_data</function>
+ </task>
+
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
+ <script>scripts/storm_upgrade.py</script>
+ <function>delete_storm_local_data</function>
+ </task>
+ </pre-downgrade>
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
@@ -935,7 +964,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -946,7 +976,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -959,7 +990,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -972,7 +1004,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
index b7465f7..e3957d6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.3.*.*</target>
<target-stack>HDP-2.3</target-stack>
<type>NON_ROLLING</type>
@@ -63,10 +62,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -168,9 +167,9 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<parallel-scheduler/>
<service name="HBASE">
@@ -253,12 +252,16 @@
<!--YARN-->
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!--TEZ-->
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!-- HBASE -->
@@ -273,7 +276,9 @@
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus">
@@ -306,7 +311,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>true</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -363,7 +367,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -442,8 +447,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -522,8 +527,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -569,12 +574,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -610,8 +609,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -687,14 +686,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -716,14 +717,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -927,14 +930,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 eb6f333..8603e24 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
@@ -16,8 +16,7 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
<type>NON_ROLLING</type>
@@ -63,10 +62,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -169,8 +168,8 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
@@ -260,11 +259,15 @@
<!-- YARN -->
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark">
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
</execute-stage>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!-- HBASE -->
@@ -274,7 +277,9 @@
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Update HBase Configuration">
- <task xsi:type="server_action" summary="Update HBase Env Configuration" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction">
+ <summary>Update HBase Env Configuration</summary>
+ </task>
</execute-stage>
<!-- TEZ -->
@@ -283,7 +288,9 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!-- HIVE -->
@@ -297,7 +304,9 @@
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
@@ -352,7 +361,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -409,7 +417,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -488,8 +497,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -568,8 +577,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>SPARK</service>
@@ -615,12 +624,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -656,8 +659,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -733,14 +736,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -762,14 +767,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -973,14 +980,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -1022,12 +1031,14 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1038,12 +1049,14 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1056,7 +1069,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1067,7 +1081,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1080,7 +1095,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1093,7 +1109,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
index f5f06c0..ad9fc97 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
@@ -16,21 +16,19 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.5.*.*</target>
<target-stack>HDP-2.5</target-stack>
<type>NON_ROLLING</type>
<prerequisite-checks>
<check>org.apache.ambari.server.checks.RangerAuditDbCheck</check>
+ <check>org.apache.ambari.server.checks.AtlasPresenceCheck</check>
<configuration>
<!-- Configuration properties for all pre-reqs including required pre-reqs -->
<check-properties name="org.apache.ambari.server.checks.HiveDynamicServiceDiscoveryCheck">
<property name="min-failure-stack-version">HDP-2.3.0.0</property>
</check-properties>
</configuration>
-
- <check>org.apache.ambari.server.checks.AtlasPresenceCheck</check>
</prerequisite-checks>
<!-- Instructs the upgrade pack how to build the configuration pack -->
@@ -72,10 +70,10 @@
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
- <service-check>false</service-check>
<service name="FLUME">
<component>FLUME_HANDLER</component>
@@ -139,7 +137,9 @@
<task xsi:type="manual">
<message>Before continuing, please backup the Oozie Server database referenced by the Oozie server located on {{hosts.all}}.</message>
</task>
- <task xsi:type="server_action" summary="Fix oozie admin users" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
+ <summary>Fix oozie admin users</summary>
+ </task>
</execute-stage>
<execute-stage service="HIVE" component="HIVE_METASTORE" title="Backup Hive Metastore">
@@ -179,8 +179,8 @@
</group>
<group xsi:type="stop" name="STOP_LOW_LEVEL_SERVICE_COMPONENTS" title="Stop Components for Core Services">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
@@ -274,7 +274,9 @@
<!-- YARN -->
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark">
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
</execute-stage>
<execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Yarn Resourcemanager">
@@ -286,7 +288,9 @@
</execute-stage>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client">
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</execute-stage>
<!-- HBASE -->
@@ -300,7 +304,9 @@
</execute-stage>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Update HBase Configuration">
- <task xsi:type="server_action" summary="Update HBase Env Configuration" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction">
+ <summary>Update HBase Env Configuration</summary>
+ </task>
</execute-stage>
<!-- TEZ -->
@@ -309,7 +315,9 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
<!-- SQOOP -->
@@ -343,12 +351,16 @@
</execute-stage>
<execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Hive Server">
- <task xsi:type="server_action" summary="Update hive-env content" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HiveEnvClasspathAction">
+ <summary>Update hive-env content</summary>
+ </task>
</execute-stage>
<!--OOZIE-->
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
</execute-stage>
<execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server">
@@ -406,11 +418,15 @@
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties">
- <task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
+ <summary>Calculating Ranger Properties</summary>
+ </task>
</execute-stage>
<execute-stage service="RANGER" component="RANGER_ADMIN" title="Configuring Ranger Alerts">
- <task xsi:type="server_action" summary="Configuring Ranger Alerts" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction">
+ <summary>Configuring Ranger Alerts</summary>
+ </task>
</execute-stage>
<!-- RANGER KMS -->
@@ -432,8 +448,9 @@
<task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus in KerberosDescriptor">
- <task xsi:type="server_action" summary="Upgrade Storm Security Configs to 1.0"
- class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.StormUpgradeKerberosDescriptorConfig">
+ <summary>Upgrade Storm Security Configs to 1.0</summary>
+ </task>
</execute-stage>
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
@@ -471,7 +488,6 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<parallel-scheduler/>
<service name="ZOOKEEPER">
- <service-check>false</service-check>
<component>ZOOKEEPER_SERVER</component>
<component>ZOOKEEPER_CLIENT</component>
</service>
@@ -528,7 +544,8 @@
<supports-auto-skip-failure>false</supports-auto-skip-failure>
<execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode">
- <task xsi:type="execute" hosts="all" summary="Wait for NameNode to leave Safemode">
+ <task xsi:type="execute" hosts="all">
+ <summary>Wait for NameNode to leave Safemode</summary>
<script>scripts/namenode.py</script>
<function>wait_for_safemode_off</function>
</task>
@@ -608,8 +625,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>RANGER</service>
@@ -688,8 +705,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>HIVE</service>
<service>OOZIE</service>
@@ -735,12 +752,6 @@
<component>STORM_UI_SERVER</component>
<component>DRPC_SERVER</component>
</service>
-
- <execute-stage service="STORM" component="DRPC_SERVER" title="Rebuild Storm Topology">
- <task xsi:type="manual">
- <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message>
- </task>
- </execute-stage>
</group>
<group xsi:type="restart" name="SLIDER" title="Slider">
@@ -776,8 +787,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>FALCON</service>
<service>KNOX</service>
@@ -845,14 +856,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -874,14 +887,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -1093,14 +1108,16 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
@@ -1142,24 +1159,28 @@
<service name="STORM">
<component name="NIMBUS">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper">
+ <task xsi:type="execute" hosts="any">
+ <summary>Removing Storm data from ZooKeeper</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_zookeeper_data</function>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1172,7 +1193,8 @@
<component name="SUPERVISOR">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1183,7 +1205,8 @@
<message>Before continuing, please deactivate and kill any currently running topologies.</message>
</task>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1196,7 +1219,8 @@
<component name="STORM_UI_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
@@ -1209,7 +1233,8 @@
<component name="DRPC_SERVER">
<pre-upgrade>
- <task xsi:type="execute" summary="Removing local Storm data">
+ <task xsi:type="execute">
+ <summary>Removing local Storm data</summary>
<script>scripts/storm_upgrade.py</script>
<function>delete_storm_local_data</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index 533a1e9..9b9848e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -16,12 +16,11 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.3.*.*</target>
+ <target-stack>HDP-2.3</target-stack>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
- <target-stack>HDP-2.3</target-stack>
<type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
@@ -166,8 +165,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>KAFKA</service>
@@ -183,8 +182,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -207,8 +206,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -324,8 +323,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -450,7 +449,8 @@
<!-- In HDP 2.3.4.0, Kafka had changes that required stopping all Kafka Brokers, running a migration script,
and then starting one at a time. This is needed during both upgrade and downgrade. -->
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Shut down all Kafka Brokers">
+ <task xsi:type="execute" hosts="all">
+ <summary>Shut down all Kafka Brokers</summary>
<script>scripts/kafka_broker.py</script>
<function>stop</function>
</task>
@@ -473,7 +473,8 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -483,14 +484,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -512,14 +515,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -586,7 +591,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -657,7 +664,9 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_3_0_0_tez_client_adjust_tez_lib_uris_property"/>
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</pre-upgrade>
<upgrade>
<task xsi:type="restart-task"/>
@@ -760,29 +769,35 @@
<service name="OOZIE">
<component name="OOZIE_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2ef600f4/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 6583010..51fbcbf 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
@@ -16,13 +16,12 @@
limitations under the License.
-->
-
-<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<upgrade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="upgrade-pack.xsd">
<target>2.4.*.*</target>
<target-stack>HDP-2.4</target-stack>
- <type>ROLLING</type>
<skip-failures>false</skip-failures>
<skip-service-check-failures>false</skip-service-check-failures>
+ <type>ROLLING</type>
<prerequisite-checks>
<!-- List of additional pre-req checks to run in addition to the required pre-reqs -->
@@ -45,9 +44,6 @@
</configuration>
</prerequisite-checks>
- <skip-failures>false</skip-failures>
- <skip-service-check-failures>false</skip-service-check-failures>
-
<order>
<group xsi:type="cluster" name="PRE_CLUSTER" title="Prepare Upgrade">
<direction>UPGRADE</direction>
@@ -137,7 +133,9 @@
<skippable>true</skippable>
<execute-stage service="HBASE" component="HBASE_MASTER" title="Update HBase Configuration">
- <task xsi:type="server_action" summary="Update HBase Env Configuration" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.HBaseEnvMaxDirectMemorySizeAction">
+ <summary>Update HBase Env Configuration</summary>
+ </task>
</execute-stage>
</group>
@@ -157,15 +155,17 @@
</execute-stage>
<execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez">
- <task xsi:type="server_action" summary="Verifying LZO codec path for Tez" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for Tez</summary>
+ </task>
</execute-stage>
</group>
<!-- This needs to be done for every Rolling Upgrade pack that changes configurations. -->
<group xsi:type="cluster" name="CONFIGURE_CLIENT_DEPENDENCIES" title="Write client configs">
+ <direction>UPGRADE</direction>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <direction>UPGRADE</direction>
<execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Write Mapreduce2 Client configs">
<task xsi:type="execute">
@@ -210,8 +210,8 @@
</group>
<group name="SERVICE_CHECK_1" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -226,8 +226,8 @@
</group>
<group name="CORE_SLAVES" title="Core Slaves" xsi:type="colocated">
- <skippable>true</skippable>
<service-check>false</service-check>
+ <skippable>true</skippable>
<service name="HDFS">
<component>DATANODE</component>
<component>NFS_GATEWAY</component>
@@ -250,8 +250,8 @@
</group>
<group name="SERVICE_CHECK_2" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -275,9 +275,9 @@
</group>
<group name="SPARK" title="Spark">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<service name="SPARK">
<component>SPARK_JOBHISTORYSERVER</component>
<component>SPARK_THRIFTSERVER</component>
@@ -292,9 +292,9 @@
</group>
<group name="OOZIE" title="Oozie">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<service name="OOZIE">
<component>OOZIE_SERVER</component>
</service>
@@ -308,9 +308,9 @@
</group>
<group name="FALCON" title="Falcon">
+ <service-check>false</service-check>
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <service-check>false</service-check>
<service name="FALCON">
<component>FALCON_SERVER</component>
</service>
@@ -368,8 +368,8 @@
</group>
<group name="SERVICE_CHECK_3" title="All Service Checks" xsi:type="service-check">
- <skippable>true</skippable>
<direction>UPGRADE</direction>
+ <skippable>true</skippable>
<priority>
<service>ZOOKEEPER</service>
<service>HDFS</service>
@@ -491,7 +491,8 @@
<service name="RANGER">
<component name="RANGER_ADMIN">
<pre-upgrade>
- <task xsi:type="execute" hosts="all" summary="Stop Ranger Admin">
+ <task xsi:type="execute" hosts="all">
+ <summary>Stop Ranger Admin</summary>
<script>scripts/ranger_admin.py</script>
<function>stop</function>
</task>
@@ -501,14 +502,16 @@
<function>set_pre_start</function>
</task>
- <task xsi:type="execute" hosts="any" summary="Upgrading Ranger database schema">
+ <task xsi:type="execute" hosts="any">
+ <summary>Upgrading Ranger database schema</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_database</function>
</task>
<task xsi:type="configure_function" hosts="all" />
- <task xsi:type="execute" hosts="any" summary="Applying Ranger java patches">
+ <task xsi:type="execute" hosts="any">
+ <summary>Applying Ranger java patches</summary>
<script>scripts/ranger_admin.py</script>
<function>setup_ranger_java_patches</function>
</task>
@@ -530,14 +533,16 @@
<service name="RANGER_KMS">
<component name="RANGER_KMS_SERVER">
<pre-upgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Upgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Downgrading Ranger KMS database schema">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Downgrading Ranger KMS database schema</summary>
<script>scripts/kms_server.py</script>
<function>setup_ranger_kms_database</function>
</task>
@@ -551,11 +556,12 @@
<service name="HDFS">
<component name="NAMENODE">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<upgrade>
<task xsi:type="restart-task" />
@@ -604,7 +610,9 @@
<component name="MAPREDUCE2_CLIENT">
<pre-upgrade>
- <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath">
+ <summary>Verifying LZO codec path for mapreduce</summary>
+ </task>
</pre-upgrade>
<upgrade>
@@ -624,7 +632,9 @@
<component name="RESOURCEMANAGER">
<pre-upgrade>
- <task xsi:type="server_action" summary="Calculating Yarn Properties for Spark Shuffle" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig" />
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig">
+ <summary>Calculating Yarn Properties for Spark Shuffle</summary>
+ </task>
</pre-upgrade>
<pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
@@ -778,31 +788,37 @@
<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"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</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"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task"/>
</upgrade>
</component>
<component name="SPARK_CLIENT">
- <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_remove_spark_properties_extraJavaOptions"/>
<task xsi:type="configure" id="hdp_2_4_0_0_spark_java_opts"/>
</pre-upgrade>
+
+ <pre-downgrade /> <!-- no-op to prevent config changes on downgrade -->
+
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
@@ -814,9 +830,12 @@
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" />
- <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/>
+ <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation">
+ <summary>Adjusting Oozie properties</summary>
+ </task>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
@@ -824,19 +843,22 @@
<!-- It is extremely important that both of these tasks run on the exact same host. Hence, pick the first alphabetically. -->
<task xsi:type="configure_function" hosts="first" />
- <task xsi:type="execute" hosts="first" sequential="true" summary="Upgrading the Oozie database and creating a new sharelib">
+ <task xsi:type="execute" hosts="first" sequential="true">
+ <summary>Upgrading the Oozie database and creating a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>upgrade_oozie_database_and_sharelib</function>
</task>
</pre-upgrade>
<pre-downgrade>
- <task xsi:type="execute" hosts="all" sequential="true" summary="Shut down all Oozie servers">
+ <task xsi:type="execute" hosts="all" sequential="true">
+ <summary>Shut down all Oozie servers</summary>
<script>scripts/oozie_server.py</script>
<function>stop</function>
</task>
- <task xsi:type="execute" hosts="any" sequential="true" summary="Create a new sharelib">
+ <task xsi:type="execute" hosts="any" sequential="true">
+ <summary>Create a new sharelib</summary>
<script>scripts/oozie_server_upgrade.py</script>
<function>create_sharelib</function>
</task>