Repository: ambari Updated Branches: refs/heads/branch-2.4 d9d79cd71 -> 4452d0b4e
AMBARI-17051. Falcon startup properties changes for HDP 2.5 (Venkat Ranganathan via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4452d0b4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4452d0b4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4452d0b4 Branch: refs/heads/branch-2.4 Commit: 4452d0b4e5f028aef00dfdc28d731e7b1d94961f Parents: d9d79cd Author: Alejandro Fernandez <[email protected]> Authored: Tue Jun 7 15:09:45 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Tue Jun 7 15:09:45 2016 -0700 ---------------------------------------------------------------------- .../0.5.0.2.1/package/scripts/params_linux.py | 2 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 12 +++++ .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 5 ++ .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 3 ++ .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 10 ++++ .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 5 ++ .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 3 ++ .../configuration/falcon-startup.properties.xml | 52 ++++++++++++++++++++ 8 files changed, 91 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py index 22fb691..41954a5 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py @@ -72,7 +72,7 @@ if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, # Extensions dir is only available in HDP 2.5 and higher falcon_extensions_source_dir = os.path.join(stack_root, "current", falcon_root, "extensions") # Dir in HDFS - falcon_extensions_dest_dir = "/apps/falcon/extensions" + falcon_extensions_dest_dir = default("/configurations/falcon-startup.properties/*.extension.store.uri", "/apps/falcon/extensions") else: falcon_webapp_dir = '/var/lib/falcon/webapp' falcon_home = '/usr/lib/falcon' http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index c72070b..9df0663 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -451,6 +451,18 @@ </component> </service> + <service name="FALCON"> + <component name="FALCON_SERVER"> + <changes> + <definition xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"> + <type>falcon-startup.properties</type> + <set key="*.application.services" value="org.apache.falcon.security.AuthenticationInitializationService, org.apache.falcon.workflow.WorkflowJobEndNotificationService, org.apache.falcon.service.ProcessSubscriberService, org.apache.falcon.extensions.ExtensionService, org.apache.falcon.service.LifecyclePolicyMap, org.apache.falcon.entity.store.ConfigurationStore, org.apache.falcon.rerun.service.RetryService, org.apache.falcon.rerun.service.LateRunService, org.apache.falcon.service.LogCleanupService, org.apache.falcon.metadata.MetadataMappingService"/> + </definition> + </changes> + </component> + </service> + </services> + </services> </upgrade-config-changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/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 0a1bb40..f40f760 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 @@ -340,6 +340,11 @@ <task xsi:type="configure" id="hdp_2_4_0_0_oozie_remove_service_classes" /> </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> + <!-- KAFKA --> <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Kafka"> <task xsi:type="configure" id ="hdp_2_4_0_0_kafka_broker_deprecate_port"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/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 a3a3c7d..ea5ff5a 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 @@ -814,6 +814,9 @@ <service name="FALCON"> <component name="FALCON_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/> + </pre-upgrade> <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index 60cac05..f559031 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -284,6 +284,16 @@ </component> </service> + <service name="FALCON"> + <component name="FALCON_SERVER"> + <changes> + <definition xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"> + <type>falcon-startup.properties</type> + <set key="*.application.services" value="org.apache.falcon.security.AuthenticationInitializationService, org.apache.falcon.workflow.WorkflowJobEndNotificationService, org.apache.falcon.service.ProcessSubscriberService, org.apache.falcon.extensions.ExtensionService, org.apache.falcon.service.LifecyclePolicyMap, org.apache.falcon.entity.store.ConfigurationStore, org.apache.falcon.rerun.service.RetryService, org.apache.falcon.rerun.service.LateRunService, org.apache.falcon.service.LogCleanupService, org.apache.falcon.metadata.MetadataMappingService"/> + </definition> + </changes> + </component> + </service> </services> </upgrade-config-changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/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 0f3bff4..7fb03dc 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml @@ -296,6 +296,11 @@ <task xsi:type="server_action" summary="Adjusting Oozie properties" class="org.apache.ambari.server.serveraction.upgrades.OozieConfigCalculation"/> </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> + <!-- 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"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/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 cadb3c7..7f988e3 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 @@ -777,6 +777,9 @@ <service name="FALCON"> <component name="FALCON_SERVER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0_falcon_server_adjust_services_property"/> + </pre-upgrade> <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/4452d0b4/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml index 0f542cc..4c90207 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml @@ -27,4 +27,56 @@ <on-ambari-upgrade add="false" change="true" delete="true"/> <on-stack-upgrade add="true" change="true" delete="false"/> </property> + <property> + <name>*.application.services</name> + <value>org.apache.falcon.security.AuthenticationInitializationService,\ + org.apache.falcon.workflow.WorkflowJobEndNotificationService, \ + org.apache.falcon.service.ProcessSubscriberService,\ + org.apache.falcon.extensions.ExtensionService,\ + org.apache.falcon.service.LifecyclePolicyMap,\ + org.apache.falcon.entity.store.ConfigurationStore,\ + org.apache.falcon.rerun.service.RetryService,\ + org.apache.falcon.rerun.service.LateRunService,\ + org.apache.falcon.service.LogCleanupService,\ + org.apache.falcon.metadata.MetadataMappingService + </value> + <description>Falcon application services</description> + <on-ambari-upgrade add="false" change="true" delete="false"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>*.falcon.feed.lifecycle.policies</name> + <value>org.apache.falcon.lifecycle.retention.AgeBasedDelete</value> + <description>Feed lifecycle policy</description> + <on-ambari-upgrade add="false" change="true" delete="false"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>*.lifecycle.engine.impl</name> + <value>org.apache.falcon.lifecycle.engine.oozie.OoziePolicyBuilderFactory</value> + <description>Feed lifecycle engine</description> + <on-ambari-upgrade add="false" change="true" delete="false"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>*.extension.store.uri</name> + <value>/apps/falcon/extensions</value> + <description>Extension store uri</description> + <on-ambari-upgrade add="false" change="true" delete="false"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>*.falcon.feed.lifecycle.policy.builders</name> + <value>org.apache.falcon.lifecycle.engine.oozie.retention.AgeBasedDeleteBuilder</value> + <description>Feed lifecycle policies</description> + <on-ambari-upgrade add="false" change="true" delete="false"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>*.shared.libs</name> + <value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value> + <description>Falcon shared libraries</description> + <on-ambari-upgrade add="false" change="true" delete="false"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> </configuration>
