Repository: ambari Updated Branches: refs/heads/trunk ef4a3ee52 -> c18bd403d
AMBARI-16648. Support Storm 1.0 in EU/RU to HDP 2.5 (Sriharsha Chintalapani via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c18bd403 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c18bd403 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c18bd403 Branch: refs/heads/trunk Commit: c18bd403d3f3fb6bb37d35534505eef9f9dc920b Parents: ef4a3ee Author: Alejandro Fernandez <[email protected]> Authored: Wed May 25 17:44:57 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Thu May 26 13:08:46 2016 -0700 ---------------------------------------------------------------------- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 12 ++-- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 5 -- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 74 ++++++++++++++++++-- .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 66 +++++++++++++++++ .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 5 -- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 74 ++++++++++++++++++-- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 26 +++++++ .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 5 -- 8 files changed, 236 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/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 dd033b8..4362fe0 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 @@ -380,6 +380,10 @@ <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> + + <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> + <task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/> + </execute-stage> </group> <!-- Now, restart all of the services. --> @@ -1065,7 +1069,7 @@ <service name="STORM"> <component name="NIMBUS"> <pre-upgrade> - <task xsi:type="execute" summary="Removing Storm data from ZooKeeper"> + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> <script>scripts/storm_upgrade.py</script> <function>delete_storm_zookeeper_data</function> </task> @@ -1077,11 +1081,7 @@ </pre-upgrade> <pre-downgrade> - <task xsi:type="manual"> - <message>Before continuing, please deactivate and kill any currently running topologies.</message> - </task> - - <task xsi:type="execute" summary="Removing Storm data from ZooKeeper"> + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> <script>scripts/storm_upgrade.py</script> <function>delete_storm_zookeeper_data</function> </task> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 525a356..4187d64 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -833,11 +833,6 @@ <task xsi:type="restart-task" /> </upgrade> </component> - <component name="STORM_REST_API"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> <component name="SUPERVISOR"> <upgrade> <task xsi:type="restart-task" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/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 9ee3e88..0e0ea1d 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 @@ -850,31 +850,95 @@ <service name="STORM"> <component name="NIMBUS"> <pre-upgrade> + <task xsi:type="manual"> + <message>Before continuing, please deactivate and kill any currently running topologies.</message> + </task> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" /> + <task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/> + + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_zookeeper_data</function> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_zookeeper_data</function> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> </component> - <component name="STORM_REST_API"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> + <component name="SUPERVISOR"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="manual"> + <message>Before continuing, please deactivate and kill any currently running topologies.</message> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> </component> + <component name="STORM_UI_SERVER"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> </component> + <component name="DRPC_SERVER"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> + + <post-upgrade> + <task xsi:type="manual"> + <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message> + </task> + </post-upgrade> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/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 625b851..5ccb153 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 @@ -329,6 +329,10 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db"/> </execute-stage> + <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> + <task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/> + </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"/> @@ -1024,27 +1028,89 @@ <service name="STORM"> <component name="NIMBUS"> + <pre-upgrade> + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_zookeeper_data</function> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_zookeeper_data</function> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task"/> </upgrade> </component> <component name="SUPERVISOR"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="manual"> + <message>Before continuing, please deactivate and kill any currently running topologies.</message> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task"/> </upgrade> </component> <component name="STORM_UI_SERVER"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + <upgrade> <task xsi:type="restart-task"/> </upgrade> </component> <component name="DRPC_SERVER"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + <upgrade> <task xsi:type="restart-task"/> </upgrade> + + <post-upgrade> + <task xsi:type="manual"> + <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message> + </task> + </post-upgrade> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml index 58aa95f..4065e87 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml @@ -808,11 +808,6 @@ <task xsi:type="restart-task" /> </upgrade> </component> - <component name="STORM_REST_API"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> <component name="SUPERVISOR"> <upgrade> <task xsi:type="restart-task" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/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 cdb8634..bc45be6 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 @@ -812,28 +812,92 @@ <service name="STORM"> <component name="NIMBUS"> <pre-upgrade> + <task xsi:type="manual"> + <message>Before continuing, please deactivate and kill any currently running topologies.</message> + </task> + <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_storm_audit_db" /> + <task xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"/> + + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_zookeeper_data</function> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> </pre-upgrade> + + <pre-downgrade> + <task xsi:type="execute" hosts="any" summary="Removing Storm data from ZooKeeper"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_zookeeper_data</function> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> </component> - <component name="STORM_REST_API"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> + <component name="SUPERVISOR"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + + <pre-downgrade> + <task xsi:type="manual"> + <message>Before continuing, please deactivate and kill any currently running topologies.</message> + </task> + + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-downgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> </component> + <component name="STORM_UI_SERVER"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> </component> + <component name="DRPC_SERVER"> + <pre-upgrade> + <task xsi:type="execute" summary="Removing local Storm data"> + <script>scripts/storm_upgrade.py</script> + <function>delete_storm_local_data</function> + </task> + </pre-upgrade> + + <post-upgrade> + <task xsi:type="manual"> + <message>Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar.</message> + </task> + </post-upgrade> + <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/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 5211276..96c6515 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 @@ -47,6 +47,32 @@ <value>10001</value> </condition> </definition> + + <definition xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0"> + <type>storm-site</type> + <replace key="_storm.thrift.nonsecure.transport" find="backtype.storm.security.auth.SimpleTransportPlugin" + replace-with="org.apache.storm.security.auth.SimpleTransportPlugin" /> + <replace key="_storm.thrift.secure.transport" find="backtype.storm.security.auth.KerberosSaslTransportPlugin" + replace-with="org.apache.storm.security.auth.KerberosSaslTransportPlugin" /> + <replace key="storm.messaging.transport" find="backtype.storm.messaging.netty.Context" + replace-with="org.apache.storm.messaging.netty.Context" /> + <replace key="nimbus.topology.validator" find="backtype.storm.nimbus.DefaultTopologyValidator" + replace-with="org.apache.storm.nimbus.DefaultTopologyValidator" /> + <replace key="topology.spout.wait.strategy" find="backtype.storm.spout.SleepSpoutWaitStrategy" + replace-with="org.apache.storm.spout.SleepSpoutWaitStrategy" /> + <replace key="topology.kryo.factory" find="backtype.storm.serialization.DefaultKryoFactory" + replace-with="org.apache.storm.serialization.DefaultKryoFactory" /> + <replace key="topology.tuple.serializer" find="backtype.storm.serialization.types.ListDelegateSerializer" + replace-with="org.apache.storm.serialization.types.ListDelegateSerializer" /> + <replace key="nimbus.authorizer" find="backtype.storm.security.auth.authorizer.SimpleACLAuthorizer" + replace-with="org.apache.storm.security.auth.authorizer.SimpleACLAuthorizer" /> + <replace key="drpc.authorizer" find="backtype.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer" + replace-with="org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer" /> + <replace key="ui.filter" find="backtype.storm.security.auth.KerberosPrincipalToLocal" + replace-with="org.apache.storm.security.auth.KerberosPrincipalToLocal" /> + <set key="client.jartransformer.class" value="org.apache.storm.hack.StormShadeTransformer" /> + </definition> + </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/c18bd403/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index d90d76d..6ce4c81 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -821,11 +821,6 @@ <task xsi:type="restart-task" /> </upgrade> </component> - <component name="STORM_REST_API"> - <upgrade> - <task xsi:type="restart-task" /> - </upgrade> - </component> <component name="SUPERVISOR"> <upgrade> <task xsi:type="restart-task" />
