Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2756B200CED for ; Fri, 18 Aug 2017 21:37:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 25A6016D5D1; Fri, 18 Aug 2017 19:37:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 519B816D5D2 for ; Fri, 18 Aug 2017 21:37:11 +0200 (CEST) Received: (qmail 25045 invoked by uid 500); 18 Aug 2017 19:37:10 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 24729 invoked by uid 99); 18 Aug 2017 19:37:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Aug 2017 19:37:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC4C1F3303; Fri, 18 Aug 2017 19:37:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Fri, 18 Aug 2017 19:37:09 -0000 Message-Id: <7eef12850ae74abb8eb3b8a3c0d2dd53@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] ambari git commit: AMBARI-21525. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi) archived-at: Fri, 18 Aug 2017 19:37:13 -0000 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 Authored: Fri Aug 18 14:15:32 2017 +0300 Committer: Vitaly Brodetskyi 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 @@ - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - - - custom - - - - - 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 - - - EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - - - custom - - - - - oozie.service.HadoopAccessorService.supported.filesystems - * - - Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed. - - - custom - - - - - - - - - - - - - - - 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 @@ - - - - - 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, - 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 - - - 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. - - - custom - - - - - 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, - 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 - - - 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. - - - custom - - - - - 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, - 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 - - - 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. - - - custom - - - - - 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, - 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 - - - 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. - - - custom - - - - - 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, - 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 - - - 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. - - - custom - - - - - 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 - - - EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - - - custom - - - - - 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 - - - EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - - - custom - - - - - oozie.service.HadoopAccessorService.supported.filesystems - * - - Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed. - - - custom - - - - - - - - - - - - - - - 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 @@ - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - 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. - - - custom - - - - - 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 - - - EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - - - custom - - - - - 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 - - - EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - - - custom - - - - - oozie.service.HadoopAccessorService.supported.filesystems - * - - Enlist the different filesystems supported for federation. If wildcard "*" is specified, then ALL file schemes will be allowed. - - - custom - - - - 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 @@ - - - - - - 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 - - - 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. - - - custom - - - - 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")