http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/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 8bee56d..1e4da76 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 @@ -75,6 +75,10 @@ <supports-auto-skip-failure>false</supports-auto-skip-failure> <parallel-scheduler/> + <service name="ATLAS"> + <component>ATLAS_SERVER</component> + </service> + <service name="FLUME"> <component>FLUME_HANDLER</component> </service> @@ -271,6 +275,13 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db"/> </execute-stage> + <!--Yarn--> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Parameterizing Yarn Log4J Properties Resource Manager"> + <task xsi:type="configure" id="yarn_log4j_parameterize"> + <summary>Updating the Yarn Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="NODEMANAGER" title="Add Spark2 shuffle"> <task xsi:type="configure" id="hdp_2_5_0_0_add_spark2_yarn_shuffle"/> @@ -294,6 +305,12 @@ </task> </execute-stage> + <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> + <task xsi:type="configure" id="oozie_log4j_parameterize"> + <summary>Updating the Oozie Log4J properties to include parameterizations</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> @@ -305,6 +322,13 @@ <task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/> </execute-stage> + <!--FALCON--> + <execute-stage service="FALCON" component="FALCON_SERVER" title="Parameterizing Falcon Log4J Properties"> + <task xsi:type="configure" id="falcon_log4j_parameterize"> + <summary>Updating the Falcon Log4J properties to include parameterizations</summary> + </task> + </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"/> @@ -333,6 +357,23 @@ </task> </execute-stage> + <!--RANGER--> + <execute-stage service="RANGER" component="RANGER_ADMIN" title="Parameterizing Ranger Admin Log4J Properties"> + <task xsi:type="configure" id="admin_log4j_parameterize"> + <summary>Updating the Ranger admin Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_USERSYNC" title="Parameterizing Ranger Usersync Log4J Properties"> + <task xsi:type="configure" id="usersync_log4j_parameterize"> + <summary>Updating the Ranger usersync Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_TAGSYNC" title="Parameterizing Ranger Tagsync Log4J Properties"> + <task xsi:type="configure" id="tagsync_log4j_parameterize"> + <summary>Updating the Ranger tagsync Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_ADMIN" title="Configuring Ranger Alerts"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerWebAlertConfigAction"> <summary>Configuring Ranger Alerts</summary> @@ -348,6 +389,12 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"/> </execute-stage> + <execute-stage service="HDFS" component="NAMENODE" title="Parameterizing Hdfs Log4J Properties"> + <task xsi:type="configure" id="hdfs_log4j_parameterize"> + <summary>Updating the Hdfs Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <!-- SQOOP --> <execute-stage service="SQOOP" component="SQOOP" title="Apply config changes for Sqoop to remove Atlas Configs"> <!-- Remove Atlas configs that were incorrectly added to sqoop-site instead of Atlas' application.properties. --> @@ -381,11 +428,30 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/> </execute-stage> + <!--HBASE--> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Parameterizing HBase Log4J Properties"> + <task xsi:type="configure" id="hbase_log4j_parameterize"> + <summary>Updating the Hbase Log4J properties to include parameterizations</summary> + </task> + </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> + <!--KNOX--> + <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Parameterizing Knox Gateway Log4J Properties"> + <task xsi:type="configure" id="knox_gateway_log4j_parameterize"> + <summary>Updating the Knox Gateway Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Parameterizing Knox Ldap Log4J Properties"> + <task xsi:type="configure" id="knox_ldap_log4j_parameterize"> + <summary>Updating the Knox Ldap Log4J properties to include parameterizations</summary> + </task> + </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"/> @@ -418,18 +484,47 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db"/> </execute-stage> + <!--KAFKA--> + <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Parameterizing Kafka Log4J Properties"> + <task xsi:type="configure" id="kafka_log4j_parameterize"> + <summary>Updating the Kafka Log4J properties to include parameterizations</summary> + </task> + </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> + <!--RANGER-KMS--> + <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Parameterizing Ranger Kms Log4J Properties"> + <task xsi:type="configure" id="kms_log4j_parameterize"> + <summary>Updating the KMS Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Calculating Ranger Properties"> <condition xsi:type="security" type="kerberos"/> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKmsProxyConfig"> <summary>Adding Ranger proxy user properties</summary> </task> </execute-stage> - </group> + + <!--ZOOKEEPER--> + <execute-stage service="ZOOKEEPER" component="ZOOKEEPER_SERVER" title="Parameterizing Zookeeper Log4J Properties"> + <task xsi:type="configure" id="zookeeper_log4j_parameterize"> + <summary>Updating the Zookeeper Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--ATLAS--> + <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Parameterizing Atlas Log4J Properties"> + <task xsi:type="configure" id="atlas_log4j_parameterize"> + <summary>Updating the Atlas Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + </group> <!-- After processing this group, the user-specified Kerberos descriptor will be updated to work with
http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/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 23b2694..647cb45 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 @@ -275,6 +275,11 @@ <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="YARN" component="RESOURCEMANAGER" title="Parameterizing Yarn Log4J Properties Resource Manager"> + <task xsi:type="configure" id="yarn_log4j_parameterize"> + <summary>Updating the Yarn Log4J properties to include parameterizations</summary> + </task> + </execute-stage> <!-- YARN --> <execute-stage service="YARN" component="NODEMANAGER" title="Add Spark2 shuffle"> @@ -305,10 +310,21 @@ </task> </execute-stage> + <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie Server"> + <task xsi:type="configure" id="oozie_log4j_parameterize"> + <summary>Updating the Oozie Log4J properties to include parameterizations</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"/> </execute-stage> + <execute-stage service="FALCON" component="FALCON_SERVER" title="Parameterizing Falcon Log4J Properties"> + <task xsi:type="configure" id="falcon_log4j_parameterize"> + <summary>Updating the Falcon Log4J properties to include parameterizations</summary> + </task> + </execute-stage> <!-- RANGER --> <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes for Ranger Admin"> @@ -331,6 +347,22 @@ <task xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"/> </execute-stage> + <execute-stage service="RANGER" component="RANGER_ADMIN" title="Parameterizing Ranger Admin Log4J Properties"> + <task xsi:type="configure" id="admin_log4j_parameterize"> + <summary>Updating the Ranger admin Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_USERSYNC" title="Parameterizing Ranger Usersync Log4J Properties"> + <task xsi:type="configure" id="usersync_log4j_parameterize"> + <summary>Updating the Ranger usersync Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_TAGSYNC" title="Parameterizing Ranger Tagsync Log4J Properties"> + <task xsi:type="configure" id="tagsync_log4j_parameterize"> + <summary>Updating the Ranger tagsync Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties"> <condition xsi:type="security" type="kerberos"/> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"> @@ -357,6 +389,13 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hdfs_audit_db"/> </execute-stage> + <!--HDFS--> + <execute-stage service="HDFS" component="NAMENODE" title="Parameterizing Hdfs Log4J Properties"> + <task xsi:type="configure" id="hdfs_log4j_parameterize"> + <summary>Updating the Hdfs Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <!-- SQOOP --> <execute-stage service="SQOOP" component="SQOOP" title="Apply config changes for Sqoop to remove Atlas Configs"> <!-- Remove Atlas configs that were incorrectly added to sqoop-site instead of Atlas' application.properties. --> @@ -390,10 +429,28 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db"/> </execute-stage> + <!--HBASE--> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Parameterizing HBase Log4J Properties"> + <task xsi:type="configure" id="hbase_log4j_parameterize"> + <summary>Updating the Hbase Log4J properties to include parameterizations</summary> + </task> + </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> + <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Parameterizing Knox Gateway Log4J Properties"> + <task xsi:type="configure" id="knox_gateway_log4j_parameterize"> + <summary>Updating the Knox Gateway Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Parameterizing Knox Ldap Log4J Properties"> + <task xsi:type="configure" id="knox_ldap_log4j_parameterize"> + <summary>Updating the Knox Ldap Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <!-- STORM --> <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm Nimbus"> @@ -427,18 +484,46 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db"/> </execute-stage> + <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Parameterizing Kafka Log4J Properties"> + <task xsi:type="configure" id="kafka_log4j_parameterize"> + <summary>Updating the Kafka Log4J properties to include parameterizations</summary> + </task> + </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> + <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Parameterizing Ranger Kms Log4J Properties"> + <task xsi:type="configure" id="kms_log4j_parameterize"> + <summary>Updating the KMS Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Calculating Ranger Properties"> <condition xsi:type="security" type="kerberos"/> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKmsProxyConfig"> <summary>Adding Ranger proxy user properties</summary> </task> </execute-stage> - </group> + + <!--ATLAS--> + <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Parameterizing Atlas Log4J Properties"> + <task xsi:type="configure" id="atlas_log4j_parameterize"> + <summary>Updating the Atlas Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--ZOOKEEPER--> + <execute-stage service="ZOOKEEPER" component="ZOOKEEPER_SERVER" title="Parameterizing Zookeeper Log4J Properties"> + <task xsi:type="configure" id="zookeeper_log4j_parameterize"> + <summary>Updating the Zookeeper Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + </group> <!-- After processing this group, the user-specified Kerberos descriptor will be updated to work with http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/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 e6f952d..fac26de 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 @@ -543,6 +543,10 @@ <processing> <service name="ZOOKEEPER"> <component name="ZOOKEEPER_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="zookeeper_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade/> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -558,6 +562,7 @@ <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> + <task xsi:type="configure" id="admin_log4j_parameterize" /> <task xsi:type="execute" hosts="all"> <summary>Stop Ranger Admin</summary> <script>scripts/ranger_admin.py</script> @@ -606,6 +611,19 @@ </component> <component name="RANGER_USERSYNC"> + <pre-upgrade> + <task xsi:type="configure" id="usersync_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade/> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + <component name="RANGER_TAGSYNC"> + <pre-upgrade> + <task xsi:type="configure" id="tagsync_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -616,7 +634,7 @@ <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="configure" id="kms_log4j_parameterize" /> <task xsi:type="execute" hosts="any" sequential="true"> <summary>Upgrading Ranger KMS database schema</summary> <script>scripts/kms_server.py</script> @@ -643,6 +661,7 @@ <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" /> <task xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility" /> + <task xsi:type="configure" id="kafka_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -658,6 +677,7 @@ <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" /> + <task xsi:type="configure" id="hdfs_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -737,6 +757,8 @@ <summary>Calculating Yarn Properties for Spark Shuffle</summary> </task> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" /> + <task xsi:type="configure" id="yarn_log4j_parameterize" /> + </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -768,6 +790,7 @@ <component name="HBASE_MASTER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db" /> + <task xsi:type="configure" id="hbase_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -912,6 +935,7 @@ <service name="OOZIE"> <component name="OOZIE_SERVER"> <pre-upgrade> + <task xsi:type="configure" id="oozie_log4j_parameterize" /> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"> <summary>Adjusting Oozie properties</summary> </task> @@ -965,6 +989,7 @@ <component name="FALCON_SERVER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/> + <task xsi:type="configure" id="falcon_log4j_parameterize" /> </pre-upgrade> <pre-downgrade/> <upgrade> @@ -982,6 +1007,8 @@ <component name="KNOX_GATEWAY"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db" /> + <task xsi:type="configure" id="knox_gateway_log4j_parameterize" /> + <task xsi:type="configure" id="knox_ldap_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -1140,5 +1167,16 @@ </upgrade> </component> </service> + <service name="ATLAS"> + <component name="ATLAS_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="atlas_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> </processing> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml index dc21124..d75cb24 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml @@ -548,6 +548,10 @@ <processing> <service name="ZOOKEEPER"> <component name="ZOOKEEPER_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="zookeeper_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -574,6 +578,7 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_audit_db_ranger_admin_site" /> <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="configure" id="admin_log4j_parameterize" /> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation"> <summary>Calculating Ranger Properties</summary> @@ -612,6 +617,19 @@ </component> <component name="RANGER_USERSYNC"> + <pre-upgrade> + <task xsi:type="configure" id="usersync_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + <component name="RANGER_TAGSYNC"> + <pre-upgrade> + <task xsi:type="configure" id="tagsync_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -622,7 +640,7 @@ <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="configure" id="kms_log4j_parameterize" /> <task xsi:type="execute" hosts="any" sequential="true"> <summary>Upgrading Ranger KMS database schema</summary> <script>scripts/kms_server.py</script> @@ -649,6 +667,7 @@ <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_kafka_audit_db" /> <task xsi:type="configure" id="hdp_2_5_0_0_add_protocol_compatibility" /> + <task xsi:type="configure" id="kafka_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -664,6 +683,7 @@ <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" /> + <task xsi:type="configure" id="hdfs_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -743,6 +763,7 @@ <summary>Calculating Yarn Properties for Spark Shuffle</summary> </task> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" /> + <task xsi:type="configure" id="yarn_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -774,6 +795,7 @@ <component name="HBASE_MASTER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_hbase_audit_db" /> + <task xsi:type="configure" id="hbase_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -918,6 +940,7 @@ <service name="OOZIE"> <component name="OOZIE_SERVER"> <pre-upgrade> + <task xsi:type="configure" id="oozie_log4j_parameterize" /> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"> <summary>Adjusting Oozie properties</summary> </task> @@ -971,6 +994,7 @@ <component name="FALCON_SERVER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/> + <task xsi:type="configure" id="falcon_log4j_parameterize" /> </pre-upgrade> <pre-downgrade/> <upgrade> @@ -988,6 +1012,8 @@ <component name="KNOX_GATEWAY"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_knox_audit_db" /> + <task xsi:type="configure" id="knox_ldap_log4j_parameterize" /> + <task xsi:type="configure" id="knox_gateway_log4j_parameterize" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> @@ -1146,5 +1172,17 @@ </upgrade> </component> </service> + <service name="ATLAS"> + <component name="ATLAS_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="atlas_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> + <upgrade> + <task xsi:type="restart-task" /> + </upgrade> + </component> + </service> + </processing> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/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 40052d8..d5dec43 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 @@ -56,7 +56,112 @@ </changes> </component> </service> - + <service name="ZOOKEEPER"> + <component name="ZOOKEEPER_SERVER"> + <changes> + <!-- Zookeeper Rolling properties for log4j need to be parameterized. --> + <definition xsi:type="configure" id="zookeeper_log4j_parameterize" summary="Parameterizing ZooKeeper Log4J Properties"> + <type>zookeeper-log4j</type> + <set key="zookeeper_log_max_backup_size" value="10"/> + <set key="zookeeper_log_number_of_backup_files" value="10"/> + <regex-replace key="content" find="^log4j.appender.ROLLINGFILE.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.ROLLINGFILE.MaxFileSize={{zookeeper_log_max_backup_size}}MB"/> + <regex-replace key="content" find="^#log4j.appender.ROLLINGFILE.MaxBackupIndex=([0-9]+)" replace-with="#log4j.appender.ROLLINGFILE.MaxBackupIndex={{zookeeper_log_number_of_backup_files}}"/> + </definition> + </changes> + </component> + </service> + <service name="ATLAS"> + <component name="ATLAS_SERVER"> + <changes> + <definition xsi:type="configure" id="atlas_log4j_parameterize" summary="Parameterizing Atlas Log4J Properties"> + <type>atlas-log4j</type> + <set key="atlas_log_max_backup_size" value="256"/> + <set key="atlas_log_number_of_backup_files" value="20"/> + <replace key="content" find="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">\n<param name="MaxFileSize" value="{{atlas_log_max_backup_size}}MB" />"/> + <replace key="content" find="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">\n<param name="MaxFileSize" value="{{atlas_log_number_of_backup_files}}" />"/> + </definition> + </changes> + </component> + </service> + <service name="OOZIE"> + <component name="OOZIE_SERVER"> + <changes> + <!-- Oozie Rolling properties for log4j need to be parameterized. --> + <definition xsi:type="configure" id="oozie_log4j_parameterize" summary="Parameterizing Oozie Log4J Properties"> + <type>oozie-log4j</type> + <set key="oozie_log_maxhistory" value="720"/> + <regex-replace key="content" find="^log4j.appender.oozie.RollingPolicy.MaxHistory=([0-9]+)" replace-with="log4j.appender.oozie.RollingPolicy.MaxHistory={{oozie_log_maxhistory}}"/> + </definition> + </changes> + </component> + </service> + <service name="YARN"> + <component name="RESOURCEMANAGER"> + <changes> + <!-- Yarn Rolling properties for log4j need to be parameterized. --> + <definition xsi:type="configure" id="yarn_log4j_parameterize" summary="Parameterizing Yarn Log4J Properties"> + <type>yarn-log4j</type> + <set key="yarn_rm_summary_log_max_backup_size" value="256"/> + <set key="yarn_rm_summary_log_number_of_backup_files" value="20"/> + <regex-replace key="content" find="^log4j.appender.RMSUMMARY.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.RMSUMMARY.MaxFileSize={{yarn_rm_summary_log_max_backup_size}}MB"/> + <regex-replace key="content" find="^log4j.appender.RMSUMMARY.MaxBackupIndex=([0-9]+)" replace-with="log4j.appender.RMSUMMARY.MaxBackupIndex={{yarn_rm_summary_log_number_of_backup_files}}"/> + </definition> + </changes> + </component> + </service> + <service name="HDFS"> + <component name="NAMENODE"> + <changes> + <!-- HDFS Rolling properties for log4j need to be parameterized. --> + <definition xsi:type="configure" id="hdfs_log4j_parameterize" summary="Parameterizing Hdfs Log4J Properties"> + <type>hdfs-log4j</type> + <set key="hadoop_log_max_backup_size" value="256"/> + <set key="hadoop_log_number_of_backup_files" value="10"/> + <set key="hadoop_security_log_max_backup_size" value="256"/> + <set key="hadoop_security_log_number_of_backup_files" value="20"/> + <regex-replace key="content" find="log4j.appender.RFA.MaxFileSize=([0-9]+)MB" replace-with="log4j.appender.RFA.MaxFileSize={{hadoop_log_max_backup_size}}MB"/> + <regex-replace key="content" find="log4j.appender.RFA.MaxBackupIndex=([0-9]+)" replace-with="log4j.appender.RFA.MaxBackupIndex={{hadoop_log_number_of_backup_files}}"/> + <regex-replace key="content" find="hadoop.security.log.maxfilesize=([0-9]+)MB" replace-with="hadoop.security.log.maxfilesize={{hadoop_security_log_max_backup_size}}MB"/> + <regex-replace key="content" find="hadoop.security.log.maxbackupindex=([0-9]+)" replace-with="hadoop.security.log.maxbackupindex={{hadoop_security_log_number_of_backup_files}}"/> + </definition> + </changes> + </component> + </service> + <service name="HBASE"> + <component name="HBASE_MASTER"> + <changes> + <!-- HBase Rolling properties for log4j need to be parameterized. --> + <definition xsi:type="configure" id="hbase_log4j_parameterize" summary="Parameterizing HBase Log4J Properties"> + <type>hbase-log4j</type> + <set key="hbase_log_maxfilesize" value="256"/> + <set key="hbase_log_maxbackupindex" value="20"/> + <set key="hbase_security_log_maxfilesize" value="256"/> + <set key="hbase_security_log_maxbackupindex" value="20"/> + <regex-replace key="content" find="hbase.log.maxfilesize=([0-9]+)MB" replace-with="hbase.log.maxfilesize={{hbase_log_maxfilesize}}MB"/> + <regex-replace key="content" find="hbase.log.maxbackupindex=([0-9]+)" replace-with="hbase.log.maxbackupindex={{hbase_log_maxbackupindex}}"/> + <regex-replace key="content" find="hbase.security.log.maxfilesize=([0-9]+)MB" replace-with="hbase.security.log.maxfilesize={{hbase_security_log_maxfilesize}}MB"/> + <regex-replace key="content" find="hbase.security.log.maxbackupindex=([0-9]+)" replace-with="hbase.security.log.maxbackupindex={{hbase_security_log_maxbackupindex}}"/> + </definition> + </changes> + </component> + </service> + <service name="FALCON"> + <component name="FALCON_SERVER"> + <changes> + <definition xsi:type="configure" id="falcon_log4j_parameterize" summary="Parameterizing Falcon Log4J Properties"> + <type>falcon-log4j</type> + <set key="falcon_log_maxfilesize" value="256"/> + <set key="falcon_log_maxbackupindex" value="20"/> + <set key="falcon_security_log_maxfilesize" value="256"/> + <set key="falcon_security_log_maxbackupindex" value="20"/> + <replace key="content" find="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
<param name="MaxFileSize" value="{{falcon_log_maxfilesize}}MB" />"/> + <replace key="content" find="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
<param name="MaxBackupIndex" value="{{falcon_log_maxbackupindex}}" />"/> + <replace key="content" find="<appender name="SECURITY" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="SECURITY" class="org.apache.log4j.DailyRollingFileAppender">
<param name="MaxFileSize" value="{{falcon_security_log_maxfilesize}}MB"/>"/> + <replace key="content" find="<appender name="SECURITY" class="org.apache.log4j.DailyRollingFileAppender">" replace-with="<appender name="SECURITY" class="org.apache.log4j.DailyRollingFileAppender">
<param name="MaxBackupIndex" value="{{falcon_security_log_maxbackupindex}}"/>"/> + </definition> + </changes> + </component> + </service> <service name="RANGER"> <component name="RANGER_ADMIN"> <changes> @@ -64,9 +169,92 @@ <type>ranger-env</type> <transfer operation="delete" delete-key="bind_anonymous" /> </definition> + <definition xsi:type="configure" id="admin_log4j_parameterize" summary="Parameterizing Ranger Log4J Properties"> + <type>admin-log4j</type> + <set key="ranger_xa_log_maxfilesize" value="256"/> + <set key="ranger_xa_log_maxbackupindex" value="20"/> + <replace key="content" find="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.xa_log_appender.MaxFileSize={{ranger_xa_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.xa_log_appender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.xa_log_appender.MaxBackupIndex={{ranger_xa_log_maxbackupindex}}"/> + </definition> + </changes> + </component> + <component name="RANGER_USERSYNC"> + <changes> + <definition xsi:type="configure" id="usersync_log4j_parameterize" summary="Parameterizing Ranger Usersync Log4J Properties"> + <type>usersync-log4j</type> + <set key="ranger_usersync_log_maxfilesize" value="256"/> + <set key="ranger_usersync_log_maxbackupindex" value="20"/> + <replace key="content" find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.logFile.MaxFileSize = {{ranger_usersync_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.logFile.MaxBackupIndex = {{ranger_usersync_log_maxbackupindex}}"/> + </definition> + </changes> + </component> + <component name="RANGER_TAGSYNC"> + <changes> + <definition xsi:type="configure" id="tagsync_log4j_parameterize" summary="Parameterizing Ranger Tagsync Log4J Properties"> + <type>tagsync-log4j</type> + <set key="ranger_tagsync_log_maxfilesize" value="256"/> + <set key="ranger_tagsync_log_number_of_backup_files" value="20"/> + <replace key="content" find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.logFile.MaxFileSize = {{ranger_tagsync_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.logFile.MaxBackupIndex = {{ranger_tagsync_log_number_of_backup_files}}"/> + </definition> </changes> </component> </service> + <service name="RANGER_KMS"> + <component name="RANGER_KMS_SERVER"> + <changes> + <definition xsi:type="configure" id="kms_log4j_parameterize" summary="Parameterizing Ranger KMS Log4J Properties"> + <type>kms-log4j</type> + <set key="ranger_kms_log_maxfilesize" value="256"/> + <set key="ranger_kms_log_maxbackupindex" value="20"/> + <set key="ranger_kms_audit_log_maxfilesize" value="256"/> + <set key="ranger_kms_audit_log_maxbackupindex" value="20"/> + <replace key="content" find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms.MaxFileSize = {{ranger_kms_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms.MaxBackupIndex = {{ranger_kms_log_maxbackupindex}}"/> + <replace key="content" find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms-audit.MaxFileSize = {{ranger_kms_audit_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms-audit.MaxBackupIndex = {{ranger_kms_audit_log_maxbackupindex}}"/> + </definition> + </changes> + </component> + </service> + <service name="KAFKA"> + <component name="KAFKA_BROKER"> + <changes> + <definition xsi:type="configure" id="kafka_log4j_parameterize" summary="Parameterizing Kafka Log4J Properties"> + <type>kafka-log4j</type> + <set key="kafka_log_maxfilesize" value="256"/> + <set key="kafka_log_maxbackupindex" value="20"/> + <set key="controller_log_maxfilesize" value="256"/> + <set key="controller_log_maxbackupindex" value="20"/> + <replace key="content" find="log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kafkaAppender.MaxFileSize = {{kafka_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kafkaAppender.MaxBackupIndex = {{kafka_log_maxbackupindex}}"/> + <replace key="content" find="log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.controllerAppender.MaxFileSize = {{controller_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.controllerAppender.MaxBackupIndex = {{controller_log_maxbackupindex}}"/> + </definition> + </changes> + </component> + </service> + <service name="KNOX"> + <component name="KNOX_GATEWAY"> + <changes> + <definition xsi:type="configure" id="knox_gateway_log4j_parameterize" summary="Parameterizing Knox Gateway Log4J Properties"> + <type>gateway-log4j</type> + <set key="knox_gateway_log_maxfilesize" value="256"/> + <set key="knox_gateway_log_maxbackupindex" value="20"/> + <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxFileSize = {{knox_gateway_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxBackupIndex = {{knox_gateway_log_maxbackupindex}}"/> + </definition> + <definition xsi:type="configure" id="knox_ldap_log4j_parameterize" summary="Parameterizing Knox Ldap Log4J Properties"> + <type>ldap-log4j</type> + <set key="knox_ldap_log_maxfilesize" value="256"/> + <set key="knox_ldap_log_maxbackupindex" value="20"/> + <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxFileSize = {{knox_ldap_log_maxfilesize}}MB"/> + <replace key="content" find="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender" replace-with="log4j.appender.drfa=org.apache.log4j.DailyRollingFileAppender
log4j.appender.drfa.MaxBackupIndex = {{knox_ldap_log_maxbackupindex}}"/> + </definition> + </changes> + </component> + </service> </services> </upgrade-config-changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/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 09608a0..5ef959b 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 @@ -285,6 +285,13 @@ </task> </execute-stage> + <!--Yarn--> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Parameterizing Yarn Log4J Properties Resource Manager"> + <task xsi:type="configure" id="yarn_log4j_parameterize"> + <summary>Updating the Yarn Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <!--TEZ--> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> @@ -298,6 +305,39 @@ <summary>Adjusting Oozie properties</summary> </task> </execute-stage> + <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Parameterizing Oozie Log4J Properties"> + <task xsi:type="configure" id="oozie_log4j_parameterize"> + <summary>Updating the Oozie Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--HDFS--> + <execute-stage service="HDFS" component="NAMENODE" title="Parameterizing Hdfs Log4J Properties"> + <task xsi:type="configure" id="hdfs_log4j_parameterize"> + <summary>Updating the Hdfs Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--HBASE--> + <execute-stage service="HBASE" component="HBASE_MASTER" title="Parameterizing HBase Log4J Properties"> + <task xsi:type="configure" id="hbase_log4j_parameterize"> + <summary>Updating the Hbase Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--ZOOKEEPER--> + <execute-stage service="ZOOKEEPER" component="ZOOKEEPER_SERVER" title="Parameterizing Zookeeper Log4J Properties"> + <task xsi:type="configure" id="zookeeper_log4j_parameterize"> + <summary>Updating the Zookeeper Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--FALCON--> + <execute-stage service="FALCON" component="FALCON_SERVER" title="Parameterizing Falcon Log4J Properties"> + <task xsi:type="configure" id="falcon_log4j_parameterize"> + <summary>Updating the Falcon Log4J properties to include parameterizations</summary> + </task> + </execute-stage> <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/> @@ -307,6 +347,61 @@ <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes for Ranger Admin"> <task xsi:type="configure" id="hdp_2_6_0_0_remove_bind_anonymous"/> </execute-stage> + + <!--RANGER--> + <execute-stage service="RANGER" component="RANGER_ADMIN" title="Parameterizing Ranger Admin Log4J Properties"> + <task xsi:type="configure" id="admin_log4j_parameterize"> + <summary>Updating the Ranger admin Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_USERSYNC" title="Parameterizing Ranger Usersync Log4J Properties"> + <task xsi:type="configure" id="usersync_log4j_parameterize"> + <summary>Updating the Ranger usersync Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="RANGER" component="RANGER_TAGSYNC" title="Parameterizing Ranger Tagsync Log4J Properties"> + <task xsi:type="configure" id="tagsync_log4j_parameterize"> + <summary>Updating the Ranger tagsync Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--RANGER-KMS--> + <execute-stage service="RANGER_KMS" component="RANGER_KMS_SERVER" title="Parameterizing Ranger Kms Log4J Properties"> + <task xsi:type="configure" id="kms_log4j_parameterize"> + <summary>Updating the KMS Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--ATLAS--> + <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Parameterizing Atlas Log4J Properties"> + <task xsi:type="configure" id="atlas_log4j_parameterize"> + <summary>Updating the Atlas Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--KAFKA--> + <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Parameterizing Kafka Log4J Properties"> + <task xsi:type="configure" id="kafka_log4j_parameterize"> + <summary>Updating the Kafka Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--KNOX--> + <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Parameterizing Knox Gateway Log4J Properties"> + <task xsi:type="configure" id="knox_gateway_log4j_parameterize"> + <summary>Updating the Knox Gateway Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + <execute-stage service="KNOX" component="KNOX_GATEWAY" title="Parameterizing Knox Ldap Log4J Properties"> + <task xsi:type="configure" id="knox_ldap_log4j_parameterize"> + <summary>Updating the Knox Ldap Log4J properties to include parameterizations</summary> + </task> + </execute-stage> + + <!--STORM--> + <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> + <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/> + </execute-stage> </group> <!-- http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index 949a174..b13a6f0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -464,6 +464,10 @@ <processing> <service name="ZOOKEEPER"> <component name="ZOOKEEPER_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="zookeeper_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -479,6 +483,7 @@ <service name="RANGER"> <component name="RANGER_ADMIN"> <pre-upgrade> + <task xsi:type="configure" id="admin_log4j_parameterize" /> <task xsi:type="configure" id="hdp_2_6_0_0_remove_bind_anonymous"/> <task xsi:type="execute" hosts="all"> <summary>Stop Ranger Admin</summary> @@ -515,6 +520,10 @@ </component> <component name="RANGER_USERSYNC"> + <pre-upgrade> + <task xsi:type="configure" id="usersync_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -523,6 +532,7 @@ <component name="RANGER_TAGSYNC"> <pre-upgrade> + <task xsi:type="configure" id="tagsync_log4j_parameterize" /> <task xsi:type="execute" hosts="all"> <script>scripts/ranger_tagsync.py</script> <function>configure_atlas_user_for_tagsync</function> @@ -540,6 +550,7 @@ <service name="RANGER_KMS"> <component name="RANGER_KMS_SERVER"> <pre-upgrade> + <task xsi:type="configure" id="kms_log4j_parameterize" /> <task xsi:type="execute" hosts="any" sequential="true"> <summary>Upgrading Ranger KMS database schema</summary> <script>scripts/kms_server.py</script> @@ -563,6 +574,10 @@ <service name="KAFKA"> <component name="KAFKA_BROKER"> + <pre-upgrade> + <task xsi:type="configure" id="kafka_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -571,6 +586,10 @@ <service name="HDFS"> <component name="NAMENODE"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -645,6 +664,10 @@ </component> <component name="RESOURCEMANAGER"> + <pre-upgrade> + <task xsi:type="configure" id="yarn_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -665,6 +688,10 @@ <service name="HBASE"> <component name="HBASE_MASTER"> + <pre-upgrade> + <task xsi:type="configure" id="hbase_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -807,6 +834,7 @@ <service name="OOZIE"> <component name="OOZIE_SERVER"> <pre-upgrade> + <task xsi:type="configure" id="oozie_log4j_parameterize" /> <task xsi:type="execute" hosts="all" sequential="true"> <summary>Shut down all Oozie servers</summary> <script>scripts/oozie_server.py</script> @@ -855,6 +883,10 @@ <service name="FALCON"> <component name="FALCON_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="falcon_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -868,6 +900,11 @@ <service name="KNOX"> <component name="KNOX_GATEWAY"> + <pre-upgrade> + <task xsi:type="configure" id="knox_gateway_log4j_parameterize" /> + <task xsi:type="configure" id="knox_ldap_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> @@ -940,6 +977,10 @@ <service name="ATLAS"> <component name="ATLAS_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="atlas_log4j_parameterize" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task"/> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/4dac2783/ambari-server/src/main/resources/upgrade-config.xsd ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade-config.xsd b/ambari-server/src/main/resources/upgrade-config.xsd index e274451..805b472 100644 --- a/ambari-server/src/main/resources/upgrade-config.xsd +++ b/ambari-server/src/main/resources/upgrade-config.xsd @@ -88,7 +88,19 @@ <xs:attribute name="if-type" use="optional" type="xs:string"/> <xs:attribute name="if-value" use="optional" type="xs:string"/> <xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/> - <xs:attribute name="mask" use="optional" type="xs:boolean"/> + <xs:attribute name="mask" use="optional" type="xs:boolean"/> + </xs:complexType> + </xs:element> + <xs:element name="regex-replace" minOccurs="0" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute name="key" use="required" type="xs:string"/> + <xs:attribute name="find" use="required" type="xs:string"/> + <xs:attribute name="replace-with" use="required" type="xs:string"/> + <xs:attribute name="if-key" use="optional" type="xs:string"/> + <xs:attribute name="if-type" use="optional" type="xs:string"/> + <xs:attribute name="if-value" use="optional" type="xs:string"/> + <xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/> + <xs:attribute name="mask" use="optional" type="xs:boolean"/> </xs:complexType> </xs:element> </xs:choice>
