You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/08/18 19:37:09 UTC
[4/5] ambari git commit: AMBARI-21525. EU failure: Oozie service
check fails if Falcon is not installed.(vbrodetskyi)
AMBARI-21525. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2f4fe911
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f4fe911
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f4fe911
Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 2f4fe911b80c558df7fed8fcacf342f702bc8c17
Parents: 6dd0feb
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Aug 18 14:15:32 2017 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Aug 18 14:15:32 2017 +0300
----------------------------------------------------------------------
.../0.5.0.2.1/configuration/oozie-site.xml | 208 -------------------
.../FALCON/configuration/oozie-site.xml | 198 ------------------
.../FALCON/configuration/oozie-site.xml | 197 ------------------
.../stacks/HDP/2.3/services/stack_advisor.py | 113 ++++++++++
.../FALCON/configuration/oozie-site.xml | 47 -----
.../stacks/HDP/2.5/services/stack_advisor.py | 18 ++
6 files changed, 131 insertions(+), 650 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f4fe911/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
deleted file mode 100644
index d46069d..0000000
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration supports_final="true">
- <property>
- <name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek_inst,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek_inst,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-create</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo,
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL constant declarations, separated by commas, format is [PREFIX:]NAME=CLASS#CONSTANT.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-start</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
- latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest,
- future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future,
- dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn,
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime,
- dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
- <value>
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-sla-create</name>
- <value>
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.HadoopAccessorService.supported.filesystems</name>
- <value>*</value>
- <description>
- Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
- <!--<property>-->
- <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.hosts</name>-->
- <!--<value>*</value>-->
- <!--<description>Falcon proxyuser hosts</description>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.groups</name>-->
- <!--<value>*</value>-->
- <!--<description>Falcon proxyuser groups</description>-->
- <!--</property>-->
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f4fe911/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
deleted file mode 100644
index 1473961..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration supports_final="true">
- <property>
- <name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-create</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo,
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL constant declarations, separated by commas, format is [PREFIX:]NAME=CLASS#CONSTANT.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-start</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
- latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest,
- future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future,
- dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn,
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime,
- dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
- <value>
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-sla-create</name>
- <value>
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.HadoopAccessorService.supported.filesystems</name>
- <value>*</value>
- <description>
- Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
- <!--<property>-->
- <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.hosts</name>-->
- <!--<value>*</value>-->
- <!--<description>Falcon proxyuser hosts</description>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.groups</name>-->
- <!--<value>*</value>-->
- <!--<description>Falcon proxyuser groups</description>-->
- <!--</property>-->
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f4fe911/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
deleted file mode 100644
index eb179e6..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration supports_final="true">
- <property>
- <name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek_inst,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek_inst,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-create</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo,
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL constant declarations, separated by commas, format is [PREFIX:]NAME=CLASS#CONSTANT.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-action-start</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
- today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
- currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek,
- lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
- latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest,
- future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future,
- dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn,
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime,
- dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
- <value>
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.ELService.ext.functions.coord-sla-create</name>
- <value>
- instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,
- user=org.apache.oozie.coord.CoordELFunctions#coord_user
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>oozie.service.HadoopAccessorService.supported.filesystems</name>
- <value>*</value>
- <description>
- Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f4fe911/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index e660742..1253720 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -926,6 +926,119 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
putStormStartupPropertyAttribute = self.putPropertyAttribute(configurations, "storm-site")
putStormStartupPropertyAttribute(notifier_plugin_property, 'delete', 'true')
+ def recommendOozieConfigurations(self, configurations, clusterData, services, hosts):
+ super(HDP23StackAdvisor, self).recommendOozieConfigurations(configurations, clusterData, services, hosts)
+ servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
+ putOozieSiteProperty = self.putProperty(configurations, "oozie-site", services)
+ putOozieSitePropertyAttributes = self.putPropertyAttribute(configurations, "oozie-site")
+
+ if "FALCON" in servicesList:
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-job-submit-instances",
+ 'now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo, \
+ today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo, \
+ yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,\
+ currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo, \
+ lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo, \
+ currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo, \
+ lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo, \
+ currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo, \
+ lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo, \
+ formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo, \
+ latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo, \
+ future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo')
+
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-action-create-inst",
+ 'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst, \
+ today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst, \
+ yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst, \
+ currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek_inst, \
+ lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek_inst, \
+ currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst, \
+ lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst, \
+ currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst, \
+ lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst, \
+ latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo, \
+ future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo, \
+ formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime, \
+ user=org.apache.oozie.coord.CoordELFunctions#coord_user')
+
+
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-action-create",
+ 'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now, \
+ today=org.apache.oozie.extensions.OozieELExtensions#ph2_today, \
+ yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday, \
+ currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek, \
+ lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek, \
+ currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth, \
+ lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth, \
+ currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear, \
+ lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear, \
+ latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo, \
+ future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo, \
+ formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime, \
+ user=org.apache.oozie.coord.CoordELFunctions#coord_user')
+
+
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-job-submit-data",
+ 'now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo, \
+ today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo, \
+ yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo, \
+ currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo, \
+ lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo, \
+ currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo, \
+ lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo, \
+ currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo, \
+ lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo, \
+ dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo, \
+ instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap, \
+ formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo, \
+ dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo, \
+ user=org.apache.oozie.coord.CoordELFunctions#coord_user')
+
+
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-action-start",
+ 'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now, \
+ today=org.apache.oozie.extensions.OozieELExtensions#ph2_today, \
+ yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday, \
+ currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek, \
+ lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek, \
+ currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth, \
+ lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth, \
+ currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear, \
+ lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear, \
+ latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest, \
+ future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future, \
+ dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn, \
+ instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime, \
+ dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset, \
+ formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime, \
+ user=org.apache.oozie.coord.CoordELFunctions#coord_user')
+
+
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-sla-submit",
+ 'instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed, \
+ user=org.apache.oozie.coord.CoordELFunctions#coord_user')
+
+
+ putOozieSiteProperty("oozie.service.ELService.ext.functions.coord-sla-create",
+ 'instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime, \
+ user=org.apache.oozie.coord.CoordELFunctions#coord_user')
+
+ putOozieSiteProperty("oozie.service.HadoopAccessorService.supported.filesystems",
+ '*')
+ else:
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-job-submit-instances', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-action-create-inst', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-action-create', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-job-submit-data', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-action-start', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-sla-submit', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.coord-sla-create', 'delete', 'true')
+ putOozieSitePropertyAttributes('oozie.service.HadoopAccessorService.supported.filesystems', 'delete', 'true')
+
+
+
+
def recommendFalconConfigurations(self, configurations, clusterData, services, hosts):
putFalconEnvProperty = self.putProperty(configurations, "falcon-env", services)
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f4fe911/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
deleted file mode 100644
index 191e667..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/oozie-site.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<configuration supports_final="false">
- <property>
- <name>oozie.service.ELService.ext.functions.workflow</name>
- <value>
- now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
- today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
- yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
- currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
- lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
- currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
- lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
- formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
- latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
- future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
- </value>
- <description>
- EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
- This property is a convenience property to add extensions to the built in executors without having to
- include all the built in ones.
- </description>
- <value-attributes>
- <type>custom</type>
- </value-attributes>
- <on-ambari-upgrade add="true"/>
- </property>
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f4fe911/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 855d33ad..596e083 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -41,6 +41,24 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
def recommendOozieConfigurations(self, configurations, clusterData, services, hosts):
super(HDP25StackAdvisor,self).recommendOozieConfigurations(configurations, clusterData, services, hosts)
putOozieEnvProperty = self.putProperty(configurations, "oozie-env", services)
+ servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
+ putOozieSiteProperty = self.putProperty(configurations, "oozie-site", services)
+ putOozieSitePropertyAttributes = self.putPropertyAttribute(configurations, "oozie-site")
+
+ if "FALCON" in servicesList:
+ putOozieSiteProperty('oozie.service.ELService.ext.functions.workflow',
+ 'now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo, \
+ today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo, \
+ yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo, \
+ currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo, \
+ lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo, \
+ currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo, \
+ lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo, \
+ formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo, \
+ latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo, \
+ future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo')
+ else:
+ putOozieSitePropertyAttributes('oozie.service.ELService.ext.functions.workflow', 'delete', 'true')
if not "oozie-env" in services["configurations"] :
Logger.info("No oozie configurations available")