You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/08 14:03:10 UTC
[19/22] ambari git commit: AMBARI-20779 ADDENDUM Create Ranger KMS
HDFS audit folder as part of install (mugdha)
AMBARI-20779 ADDENDUM Create Ranger KMS HDFS audit folder as part of install (mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2cd5a439
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2cd5a439
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2cd5a439
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 2cd5a439533e636522b3dc0c6a088a76f856590d
Parents: 569a1bb
Author: Mugdha Varadkar <mu...@apache.org>
Authored: Fri May 5 17:05:30 2017 +0530
Committer: Mugdha Varadkar <mu...@apache.org>
Committed: Mon May 8 10:29:35 2017 +0530
----------------------------------------------------------------------
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 68 ++++++++++----------
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 68 ++++++++++----------
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 67 ++++++++++---------
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 67 ++++++++++---------
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 68 ++++++++++----------
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 68 ++++++++++----------
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 68 ++++++++++----------
.../HDP/2.5/upgrades/host-upgrade-2.5.xml | 50 +++++++-------
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 68 ++++++++++----------
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 68 ++++++++++----------
.../HDP/2.6/upgrades/host-upgrade-2.6.xml | 48 +++++++-------
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 68 ++++++++++----------
12 files changed, 387 insertions(+), 389 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 e111dbf..ff1d87d 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
@@ -341,16 +341,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -389,6 +379,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -755,30 +755,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -823,6 +799,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 6230921..41cab3f 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
@@ -484,16 +484,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -532,6 +522,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -900,30 +900,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -968,6 +944,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 47a7094..76c4ed5 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
@@ -640,16 +640,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -688,6 +678,15 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
@@ -1047,30 +1046,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -1115,6 +1090,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="KAFKA">
<component name="KAFKA_BROKER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 18c0c15..5aa08c5 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
@@ -738,16 +738,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -786,6 +776,15 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
@@ -1145,30 +1144,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -1213,6 +1188,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="KAFKA">
<component name="KAFKA_BROKER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 5120740..4e66b7c 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
@@ -330,16 +330,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -378,6 +368,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -736,30 +736,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -804,6 +780,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="KAFKA">
<component name="KAFKA_BROKER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 358fb6e..9969a59 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
@@ -601,16 +601,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -649,6 +639,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -1007,30 +1007,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -1075,6 +1051,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="KAFKA">
<component name="KAFKA_BROKER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 368bbe2..4a2a502 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
@@ -694,16 +694,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -742,6 +732,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -1100,30 +1100,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -1168,6 +1144,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="KAFKA">
<component name="KAFKA_BROKER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
index c180b61..a16ef69 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/host-upgrade-2.5.xml
@@ -179,30 +179,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task" />
- </upgrade>
- </component>
- </service>
-
<service name="KAFKA">
<component name="KAFKA_BROKER">
<upgrade>
@@ -248,7 +224,31 @@
</upgrade>
</component>
</service>
-
+
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+ </component>
+ </service>
+
<service name="SLIDER">
<component name="SLIDER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/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 3ceea8f..c8cb0b3 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
@@ -383,16 +383,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -431,6 +421,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -831,30 +831,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -899,6 +875,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index c3436b9..25a8568 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -684,16 +684,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -732,6 +722,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -1163,30 +1163,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -1231,6 +1207,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml
index f923702..a5943c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/host-upgrade-2.6.xml
@@ -174,30 +174,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -242,6 +218,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cd5a439/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index a74d085..db845bd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -401,16 +401,6 @@
</service>
</group>
- <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
- <service-check>false</service-check>
- <skippable>true</skippable>
- <supports-auto-skip-failure>false</supports-auto-skip-failure>
- <parallel-scheduler/>
- <service name="RANGER_KMS">
- <component>RANGER_KMS_SERVER</component>
- </service>
- </group>
-
<group xsi:type="restart" name="HDFS" title="HDFS">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -449,6 +439,16 @@
</execute-stage>
</group>
+ <group xsi:type="restart" name="RANGER_KMS" title="Ranger KMS">
+ <service-check>false</service-check>
+ <skippable>true</skippable>
+ <supports-auto-skip-failure>false</supports-auto-skip-failure>
+ <parallel-scheduler/>
+ <service name="RANGER_KMS">
+ <component>RANGER_KMS_SERVER</component>
+ </service>
+ </group>
+
<group xsi:type="restart" name="KAFKA" title="Kafka">
<service-check>false</service-check>
<skippable>true</skippable>
@@ -885,30 +885,6 @@
</component>
</service>
- <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</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</summary>
- <script>scripts/kms_server.py</script>
- <function>setup_ranger_kms_database</function>
- </task>
- </pre-downgrade>
-
- <upgrade>
- <task xsi:type="restart-task"/>
- </upgrade>
- </component>
- </service>
-
<service name="HDFS">
<component name="NAMENODE">
<upgrade>
@@ -953,6 +929,30 @@
</component>
</service>
+ <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</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</summary>
+ <script>scripts/kms_server.py</script>
+ <function>setup_ranger_kms_database</function>
+ </task>
+ </pre-downgrade>
+
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
+ </service>
+
<service name="MAPREDUCE2">
<component name="HISTORYSERVER">
<upgrade>