ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject ambari git commit: AMBARI-15916. Handle upgrade scenarios when db audit option is removed (Mugdha Varadkar via gautam)
Date Wed, 20 Apr 2016 13:07:32 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 9bce349b8 -> ee9530041


AMBARI-15916. Handle upgrade scenarios when db audit option is removed (Mugdha Varadkar via
gautam)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee953004
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee953004
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee953004

Branch: refs/heads/trunk
Commit: ee95300414803f77e875a3272e6d2d0ecf24f16b
Parents: 9bce349
Author: Gautam Borad <gautam@apache.org>
Authored: Wed Apr 20 12:43:31 2016 +0530
Committer: Gautam Borad <gautam@apache.org>
Committed: Wed Apr 20 18:36:25 2016 +0530

----------------------------------------------------------------------
 .../2.1.0.2.0/package/scripts/params_linux.py   |   2 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |  48 ++++++
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |  17 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |  53 +++++++
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |  22 +++
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 159 +++++++++++++++++++
 6 files changed, 300 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee953004/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 327781a..6f0b620 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -314,7 +314,7 @@ cgroups_dir = "/cgroups_test/cpu"
 
 # ***********************  RANGER PLUGIN CHANGES ***********************
 # ranger host
-stack_supports_ranger_audit_db = stack_version_formatted and check_stack_feature(StackFeature.RANGER_AUDIT_DB_SUPPORT,
stack_version_formatted)
+stack_supports_ranger_audit_db = stack_version_formatted_major and check_stack_feature(StackFeature.RANGER_AUDIT_DB_SUPPORT,
stack_version_formatted_major)
 ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
 has_ranger_admin = not len(ranger_admin_hosts) == 0
 xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported']

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee953004/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 51b59e1..017980d 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
@@ -283,11 +283,19 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_namenode_ha_adjustments"/>
       </execute-stage>
 
+      <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for
Hdfs Namenode">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"/>
+      </execute-stage>
+
       <!-- 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"
/>
       </execute-stage>
 
+      <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes
for Yarn Resourcemanager">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db"/>
+      </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"/>
       </execute-stage>
@@ -298,6 +306,10 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_hbase_remove_local_indexing"/>
       </execute-stage>
 
+      <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes
for Hbase Master">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/>
+      </execute-stage>
+
       <!-- TEZ -->
       <execute-stage service="TEZ" component="TEZ_CLIENT" title="Apply config changes
for Tez">
         <task xsi:type="configure" id="hdp_2_5_0_0_tez_client_adjust_tez_lib_uris_property"/>
@@ -316,6 +328,10 @@
         <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/>
       </execute-stage>
 
+      <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes
for Hive Server">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db"/>
+      </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"/>
@@ -330,6 +346,10 @@
         <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
       </execute-stage>
 
+      <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes
for Kafka Broker">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db"/>
+      </execute-stage>
+
       <!-- SPARK -->
       <execute-stage service="SPARK" component="SPARK_JOBHISTORYSERVER" title="Apply config
changes for Spark JobHistoryServer">
         <task xsi:type="configure" id="hdp_2_4_0_0_spark_jobhistoryserver"/>
@@ -337,6 +357,34 @@
       <execute-stage service="SPARK" component="SPARK_THRIFTSERVER" title="Apply config
changes for Spark ThriftServer">
         <task xsi:type="configure" id="hdp_2_4_0_0_spark_thriftserver"/>
       </execute-stage>
+
+      <!-- RANGER -->
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_flag"/>
+      </execute-stage>
+
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_admin_properties"/>
+      </execute-stage>
+
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_ranger_admin_site"/>
+      </execute-stage>
+
+      <!-- RANGER KMS -->
+      <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Apply config
changes for Ranger KMS Server">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db"/>
+      </execute-stage>
+
+      <!-- KNOX -->
+      <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Apply config changes
for Knox Gateway">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db"/>
+      </execute-stage>
+
+      <!-- STORM -->
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm Nimbus">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db"/>
+      </execute-stage>
     </group>
 
     <!-- Now, restart all of the services. -->

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee953004/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 4c77461..a3b1494 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
@@ -442,6 +442,10 @@
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_flag" />
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_admin_properties"
/>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_ranger_admin_site"
/>
+
           <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger
database schema">
             <script>scripts/ranger_admin.py</script>
             <function>setup_ranger_database</function>
@@ -484,6 +488,8 @@
     <service name="RANGER_KMS">
       <component name="RANGER_KMS_SERVER">
         <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">
             <script>scripts/kms_server.py</script>
             <function>setup_ranger_kms_database</function>
@@ -509,6 +515,7 @@
 
         <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>
 
         <upgrade>
@@ -573,6 +580,7 @@
       <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="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" />
         </pre-upgrade>
         <pre-downgrade /> <!--  no-op to prevent config changes on downgrade -->
 
@@ -599,6 +607,7 @@
         <pre-upgrade>
           <!-- 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_4_0_0_hbase_remove_local_indexing"/>
+          <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 -->
@@ -680,6 +689,7 @@
 
           <task xsi:type="configure" id="hdp_2_5_0_0_hive_server_set_transport_mode"/>
           <task xsi:type="configure" id="hdp_2_4_0_0_hive_server_configure_authentication"/>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" />
         </pre-upgrade>
 
         <pre-downgrade>
@@ -815,6 +825,7 @@
       <component name="KAFKA_BROKER">
         <pre-upgrade>
           <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
         </pre-upgrade>
 
         <upgrade>
@@ -826,6 +837,9 @@
     <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>
 
         <upgrade>
           <task xsi:type="restart-task" />
@@ -835,6 +849,9 @@
 
     <service name="STORM">
       <component name="NIMBUS">
+        <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" />
+        </pre-upgrade>
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee953004/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 c05e33f..1569c79 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
@@ -276,6 +276,11 @@
         <task xsi:type="server_action" summary="Verifying LZO codec path for mapreduce"
class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"/>
       </execute-stage>
 
+      <!-- YARN -->
+      <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes
for Yarn Resourcemanager">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db"/>
+      </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"/>
@@ -289,6 +294,54 @@
       <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"/>
       </execute-stage>
+
+      <!-- RANGER -->
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_flag"/>
+      </execute-stage>
+
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_admin_properties"/>
+      </execute-stage>
+
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_ranger_admin_site"/>
+      </execute-stage>
+
+      <!-- HDFS -->
+      <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for
Hdfs Namenode">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"/>
+      </execute-stage>
+
+      <!-- HIVE -->
+      <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes
for Hive Server">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db"/>
+      </execute-stage>
+
+      <!-- HBASE -->
+      <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes
for Hbase Master">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/>
+      </execute-stage>
+
+      <!-- KNOX -->
+      <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Apply config changes
for Knox Gateway">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db"/>
+      </execute-stage>
+
+      <!-- STORM -->
+      <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for
Storm Nimbus">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db"/>
+      </execute-stage>
+
+      <!-- KAFKA -->
+      <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes
for Kafka Broker">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db"/>
+      </execute-stage>
+
+      <!-- RANGER KMS -->
+      <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Apply config
changes for Ranger KMS Server">
+        <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db"/>
+      </execute-stage>
     </group>
 
     <!-- Now, restart all of the services. -->

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee953004/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 1e93573..ac53f3b 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
@@ -436,6 +436,10 @@
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_flag" />
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_admin_properties"
/>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_ranger_admin_site"
/>
+
           <task xsi:type="execute" hosts="any" sequential="true" summary="Upgrading Ranger
database schema">
             <script>scripts/ranger_admin.py</script>
             <function>setup_ranger_database</function>
@@ -478,6 +482,8 @@
     <service name="RANGER_KMS">
       <component name="RANGER_KMS_SERVER">
         <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">
             <script>scripts/kms_server.py</script>
             <function>setup_ranger_kms_database</function>
@@ -503,6 +509,7 @@
 
         <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>
 
         <upgrade>
@@ -567,6 +574,7 @@
       <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="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" />
         </pre-upgrade>
         <pre-downgrade /> <!--  no-op to prevent config changes on downgrade -->
 
@@ -591,6 +599,9 @@
     <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>
 
         <upgrade>
           <task xsi:type="restart-task" />
@@ -661,6 +672,10 @@
       </component>
 
       <component name="HIVE_SERVER">
+        <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db" />
+        </pre-upgrade>
+
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>
@@ -781,6 +796,7 @@
       <component name="KAFKA_BROKER">
         <pre-upgrade>
           <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" />
         </pre-upgrade>
 
         <upgrade>
@@ -792,6 +808,9 @@
     <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>
 
         <upgrade>
           <task xsi:type="restart-task" />
@@ -801,6 +820,9 @@
 
     <service name="STORM">
       <component name="NIMBUS">
+        <pre-upgrade>
+          <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" />
+        </pre-upgrade>
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee953004/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index bb116f5..a7dbba3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -60,6 +60,17 @@
             </condition>
           </definition>
 
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hive_audit_db">
+            <type>ranger-hive-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+
         </changes>
       </component>
       <component name="WEBHCAT_SERVER">
@@ -76,6 +87,154 @@
       </component>
     </service>
 
+    <service name="RANGER">
+      <component name="RANGER_ADMIN">
+        <changes>
+
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_flag">
+            <type>ranger-env</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db"/>
+          </definition>
+
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_admin_properties">
+            <type>admin-properties</type>
+            <transfer operation="delete" delete-key="audit_db_name" />
+            <transfer operation="delete" delete-key="audit_db_user" />
+            <transfer operation="delete" delete-key="audit_db_password" />
+          </definition>
+
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_ranger_admin_site">
+            <type>ranger-admin-site</type>
+            <set key="ranger.audit.source.type" value="solr"/>
+            <transfer operation="delete" delete-key="ranger.jpa.audit.jdbc.driver" />
+            <transfer operation="delete" delete-key="ranger.jpa.audit.jdbc.url" />
+            <transfer operation="delete" delete-key="ranger.jpa.audit.jdbc.user" />
+            <transfer operation="delete" delete-key="ranger.jpa.audit.jdbc.password" />
+            <transfer operation="delete" delete-key="ranger.jpa.audit.jdbc.credential.alias"
/>
+            <transfer operation="delete" delete-key="ranger.jpa.audit.jdbc.dialect" />
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="HDFS">
+      <component name="NAMENODE">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db">
+            <type>ranger-hdfs-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="HBASE">
+      <component name="HBASE_MASTER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db">
+            <type>ranger-hbase-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="KNOX">
+      <component name="KNOX_GATEWAY">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db">
+            <type>ranger-knox-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="STORM">
+      <component name="NIMBUS">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db">
+            <type>ranger-storm-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="YARN">
+      <component name="RESOURCEMANAGER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db">
+            <type>ranger-yarn-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="KAFKA">
+      <component name="KAFKA_BROKER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db">
+            <type>ranger-kafka-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
+    <service name="RANGER_KMS">
+      <component name="RANGER_KMS_SERVER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kms_audit_db">
+            <type>ranger-kms-audit</type>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.user"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.password"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
+            <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
+          </definition>
+        </changes>
+      </component>
+    </service>
 
   </services>
 


Mime
View raw message