Repository: ambari Updated Branches: refs/heads/trunk acd7908d9 -> 419f6aa5d
AMBARI-6844. Falcon-oozie configuration issues (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/419f6aa5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/419f6aa5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/419f6aa5 Branch: refs/heads/trunk Commit: 419f6aa5dac946e860b0619e677aadc1713ee81c Parents: acd7908 Author: Andrew Onishuk <[email protected]> Authored: Wed Aug 13 17:45:08 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Aug 13 17:45:08 2014 +0300 ---------------------------------------------------------------------- .../2.0.6/services/OOZIE/package/scripts/oozie.py | 7 ++----- .../stacks/HDP/2.1/services/FALCON/metainfo.xml | 5 ----- .../2.1/services/OOZIE/configuration/oozie-site.xml | 2 +- .../python/stacks/2.0.6/OOZIE/test_oozie_client.py | 16 ++++------------ .../python/stacks/2.0.6/OOZIE/test_oozie_server.py | 16 ++++------------ ambari-web/app/data/HDP2/site_properties.js | 14 +++++++------- 6 files changed, 18 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/419f6aa5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py index 6fa2787..f5d4142 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py @@ -31,12 +31,9 @@ def oozie(is_server=False # TODO: see if see can remove this owner=params.oozie_user, mode=params.oozie_hdfs_user_mode ) - #TODO hack for falcon el - oozie_site = dict(params.config['configurations']['oozie-site']) - oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"] XmlConfig( "oozie-site.xml", - conf_dir = params.conf_dir, - configurations = oozie_site, + conf_dir = params.conf_dir, + configurations = params.config['configurations']['oozie-site'], configuration_attributes=params.config['configuration_attributes']['oozie-site'], owner = params.oozie_user, group = params.user_group, http://git-wip-us.apache.org/repos/asf/ambari/blob/419f6aa5/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml index bc66161..43c2a3e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml @@ -86,16 +86,11 @@ </commandScript> <configuration-dependencies> - <config-type>oozie-site</config-type> <config-type>falcon-env</config-type> <config-type>falcon-startup.properties</config-type> <config-type>falcon-runtime.properties</config-type> </configuration-dependencies> - <excluded-config-types> - <config-type>oozie-site</config-type> - </excluded-config-types> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/419f6aa5/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml index fa23cb5..a7efb9c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml @@ -288,7 +288,7 @@ </property> <property> <name>oozie.services.ext</name> - <value>org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService + <value>org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService </value> <description> To add/replace services defined in 'oozie.services' with custom implementations. http://git-wip-us.apache.org/repos/asf/ambari/blob/419f6aa5/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index 6687df6..50c99e0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py @@ -28,17 +28,13 @@ class TestOozieClient(RMFTestCase): command = "configure", config_file="default.json" ) - # Hack for oozie.py changing conf on fly - oozie_site = self.getConfig()['configurations']['oozie-site'].copy() - oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy() - oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"] self.assertResourceCalled('XmlConfig', 'oozie-site.xml', owner = 'oozie', group = 'hadoop', mode = 0664, conf_dir = '/etc/oozie/conf', - configurations = oozie_site, - configuration_attributes = oozie_site_attrs + configurations = self.getConfig()['configurations']['oozie-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', @@ -83,17 +79,13 @@ class TestOozieClient(RMFTestCase): command = "configure", config_file="secured.json" ) - # Hack for oozie.py changing conf on fly - oozie_site = self.getConfig()['configurations']['oozie-site'].copy() - oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy() - oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"] self.assertResourceCalled('XmlConfig', 'oozie-site.xml', owner = 'oozie', group = 'hadoop', mode = 0664, conf_dir = '/etc/oozie/conf', - configurations = oozie_site, - configuration_attributes = oozie_site_attrs + configurations = self.getConfig()['configurations']['oozie-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', http://git-wip-us.apache.org/repos/asf/ambari/blob/419f6aa5/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index 23a643e..1b98e45 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py @@ -114,10 +114,6 @@ class TestOozieServer(RMFTestCase): def assert_configure_default(self): - # Hack for oozie.py changing conf on fly - oozie_site = self.getConfig()['configurations']['oozie-site'].copy() - oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy() - oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"] self.assertResourceCalled('HdfsDirectory', '/user/oozie', security_enabled = False, keytab = UnknownConfigurationMock(), @@ -133,8 +129,8 @@ class TestOozieServer(RMFTestCase): group = 'hadoop', mode = 0664, conf_dir = '/etc/oozie/conf', - configurations = oozie_site, - configuration_attributes = oozie_site_attrs + configurations = self.getConfig()['configurations']['oozie-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', @@ -220,10 +216,6 @@ class TestOozieServer(RMFTestCase): def assert_configure_secured(self): - # Hack for oozie.py changing conf on fly - oozie_site = self.getConfig()['configurations']['oozie-site'].copy() - oozie_site_attrs = self.getConfig()['configuration_attributes']['oozie-site'].copy() - oozie_site["oozie.services.ext"] = 'org.apache.oozie.service.JMSAccessorService,' + oozie_site["oozie.services.ext"] self.assertResourceCalled('HdfsDirectory', '/user/oozie', security_enabled = True, keytab = '/etc/security/keytabs/hdfs.headless.keytab', @@ -239,8 +231,8 @@ class TestOozieServer(RMFTestCase): group = 'hadoop', mode = 0664, conf_dir = '/etc/oozie/conf', - configurations = oozie_site, - configuration_attributes = oozie_site_attrs + configurations = self.getConfig()['configurations']['oozie-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', http://git-wip-us.apache.org/repos/asf/ambari/blob/419f6aa5/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index fb24dd8..a539f81 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1212,7 +1212,7 @@ module.exports = /*********************************************oozie-site for Falcon*****************************/ { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-instances", @@ -1222,7 +1222,7 @@ module.exports = }, { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-action-create-inst", @@ -1232,7 +1232,7 @@ module.exports = }, { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-action-create", @@ -1242,7 +1242,7 @@ module.exports = }, { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-data", @@ -1252,7 +1252,7 @@ module.exports = }, { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-action-start", @@ -1262,7 +1262,7 @@ module.exports = }, { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-sla-submit", @@ -1272,7 +1272,7 @@ module.exports = }, { "id": "site property", - "isReconfigurable": false, + "isReconfigurable": true, "serviceName": "FALCON", "category": "Falcon - Oozie integration", "displayName": "oozie.service.ELService.ext.functions.coord-sla-create",
