You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/12/15 10:45:55 UTC
[2/2] ambari git commit: AMBARI-19172. 'Backup Oozie DB' message is
masked when FixOozieAdminUsers code is invoked in EU wizard (aonishuk)
AMBARI-19172. 'Backup Oozie DB' message is masked when FixOozieAdminUsers code is invoked in EU wizard (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab3985b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab3985b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab3985b3
Branch: refs/heads/branch-2.5
Commit: ab3985b374a8e9954112ce7e0c50112bad0c1db0
Parents: 34aa755
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Dec 15 12:41:57 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Dec 15 12:41:57 2016 +0200
----------------------------------------------------------------------
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 6 +++++
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 +++++
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 7 +++++-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 7 +++++-
.../src/main/resources/upgrade-pack.xsd | 26 +++++++++++++++-----
.../server/state/stack/UpgradePackTest.java | 1 +
6 files changed, 45 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab3985b3/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 b7182d1..4018da0 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
@@ -141,6 +141,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>
+ </execute-stage>
+
+ <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Fix Oozie admin users">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
<summary>Fix oozie admin users</summary>
</task>
@@ -468,6 +471,9 @@
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
<!-- 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"/>
+ </execute-stage>
+
+ <execute-stage service="STORM" component="NIMBUS" title="Apply security changes for Storm">
<!-- Add nimbus.impersonation acls . -->
<task xsi:type="configure" id="hdp_2_5_0_0_add_storm_security_configs" />
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab3985b3/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 155aaf9..a7b58f5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -142,6 +142,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>
+ </execute-stage>
+
+ <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Fix Oozie admin users">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
<summary>Fix oozie admin users</summary>
</task>
@@ -464,6 +467,9 @@
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
<!-- 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"/>
+ </execute-stage>
+
+ <execute-stage service="STORM" component="NIMBUS" title="Apply security changes for Storm">
<!-- Add nimbus.impersonation acls . -->
<task xsi:type="configure" id="hdp_2_5_0_0_add_storm_security_configs" />
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab3985b3/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 2b768ea..f58ca84 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
@@ -296,12 +296,14 @@
<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="Fix Oozie admin users">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
<summary>Fix oozie admin users</summary>
</task>
</execute-stage>
-
<!--FALCON-->
<execute-stage service="FALCON" component="FALCON_SERVER" title="Apply config changes for Falcon">
<task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/>
@@ -405,6 +407,9 @@
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
<!-- 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"/>
+ </execute-stage>
+
+ <execute-stage service="STORM" component="NIMBUS" title="Apply security changes for Storm">
<!-- Add nimbus.impersonation acls . -->
<task xsi:type="configure" id="hdp_2_5_0_0_add_storm_security_configs" />
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab3985b3/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index 92ce832..ce5105e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -297,12 +297,14 @@
<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">
<task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixOozieAdminUsers">
<summary>Fix oozie admin users</summary>
</task>
</execute-stage>
-
<!--FALCON-->
<execute-stage service="FALCON" component="FALCON_SERVER" title="Apply config changes for Falcon">
<task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/>
@@ -401,6 +403,9 @@
<execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm">
<!-- 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"/>
+ </execute-stage>
+
+ <execute-stage service="STORM" component="NIMBUS" title="Apply security changes for Storm">
<!-- Add nimbus.impersonation acls . -->
<task xsi:type="configure" id="hdp_2_5_0_0_add_storm_security_configs" />
</execute-stage>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab3985b3/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
index aeec803..3963a2c 100644
--- a/ambari-server/src/main/resources/upgrade-pack.xsd
+++ b/ambari-server/src/main/resources/upgrade-pack.xsd
@@ -111,14 +111,28 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
- <xs:element name="check-properties" minOccurs="0" maxOccurs="unbounded">
- </xs:element>
+ <xs:element name="check-properties" type="check-properties-type" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="name" />
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
+
+ <xs:complexType name="check-properties-type">
+ <xs:sequence>
+ <xs:element name="property" minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:complexType>
<xs:complexType name="abstract-group-type" abstract="true">
<xs:sequence>
@@ -158,11 +172,11 @@
<xs:extension base="abstract-group-type">
<xs:sequence>
<xs:element name="execute-stage" minOccurs="1" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
<xs:element name="condition" type="abstract-condition-type" minOccurs="0" maxOccurs="1"/>
<xs:element name="direction" type="direction-type" minOccurs="0" maxOccurs="1"/>
- <xs:element name="scope" type="scope-type" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="scope" type="scope-type" minOccurs="0" maxOccurs="1"/>
<xs:element name="task" type="abstract-task-type" minOccurs="1" maxOccurs="1"/>
</xs:sequence>
<xs:attribute name="title" type="xs:string" />
@@ -429,4 +443,4 @@
-</xs:schema>
\ No newline at end of file
+</xs:schema>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab3985b3/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 8f9f791..d9b1dd6 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
@@ -93,6 +93,7 @@ public class UpgradePackTest {
}
@Test
+ @SuppressWarnings("unchecked")
public void findAndValidateUpgradePacks() throws Exception {
IOFileFilter filter = new IOFileFilter() {