ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [5/7] ambari git commit: AMBARI-21525. Test Fix. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi)
Date Mon, 21 Aug 2017 13:37:55 GMT
AMBARI-21525. Test Fix. 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/1db9c4e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db9c4e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db9c4e9

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 1db9c4e99c68860fa85ef48c743e383c66b62ef7
Parents: 496cfe0
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Mon Aug 21 14:34:28 2017 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Mon Aug 21 14:34:28 2017 +0300

----------------------------------------------------------------------
 .../stacks/2.5/common/test_stack_advisor.py     | 107 ++++++++++++++++++-
 1 file changed, 105 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1db9c4e9/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index 9f75f9d..fd96a13 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -5892,12 +5892,32 @@ class TestHDP25StackAdvisor(TestCase):
     clusterData = {
       "components" : []
     }
+    services = {
+      "services": [
+        {
+          "StackServices": {
+            "service_name": "OOZIE"
+          }, "components": []
+        },
+        ],
+      "configurations": configurations,
+      "forced-configurations": []
+    }
     expected = {
-      "oozie-site": {"properties":{}},
+      "oozie-site": {"properties":{}, 'property_attributes':
+        {'oozie.service.ELService.ext.functions.workflow': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-job-submit-instances': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-action-start': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-job-submit-data': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-sla-submit': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-action-create': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-action-create-inst': {'delete': 'true'},
+         'oozie.service.ELService.ext.functions.coord-sla-create': {'delete': 'true'},
+         'oozie.service.HadoopAccessorService.supported.filesystems': {'delete': 'true'}}},
       "oozie-env": {"properties":{}}
     }
 
-    self.stackAdvisor.recommendOozieConfigurations(configurations, clusterData, {"configurations":{}},
None)
+    self.stackAdvisor.recommendOozieConfigurations(configurations, clusterData, services,
None)
     self.assertEquals(configurations, expected)
 
 
@@ -5928,6 +5948,89 @@ class TestHDP25StackAdvisor(TestCase):
     expected = {
       "oozie-site": {
         "properties": {
+          "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',
+          "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',
+          "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',
+          "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',
+          "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',
+          "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',
+          "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',
+          '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',
+          "oozie.service.HadoopAccessorService.supported.filesystems" : "*",
           "oozie.services.ext": "org.apache.oozie.service.JMSAccessorService," +
                                 "org.apache.oozie.service.PartitionDependencyManagerService,"
+
                                 "org.apache.oozie.service.HCatAccessorService",


Mime
View raw message