Repository: ambari Updated Branches: refs/heads/branch-2.1 b7f2a3971 -> f2dc51740
AMBARI-13855. Ambari does not change permissions and owner/group for log and PID directories during install on cluster with UMASK 027 + non-root agent (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2dc5174 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2dc5174 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2dc5174 Branch: refs/heads/branch-2.1 Commit: f2dc517403bd8f08ca76d6570a3ab89a89daa4b9 Parents: b7f2a39 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu Nov 12 18:59:28 2015 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Thu Nov 12 18:59:28 2015 +0200 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 3 +- .../0.1.0/package/scripts/hbase.py | 8 +++- .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 10 ++++- .../KNOX/0.5.0.2.2/package/scripts/knox.py | 4 +- .../AMBARI_METRICS/test_metrics_collector.py | 13 +++++-- .../stacks/2.1/FALCON/test_falcon_client.py | 8 +++- .../stacks/2.1/FALCON/test_falcon_server.py | 12 +++++- .../python/stacks/2.2/KNOX/test_knox_gateway.py | 40 +++++++++++++++----- 8 files changed, 74 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index 50e363c..0bdb45f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -241,7 +241,8 @@ def ams(name=None): owner=params.ams_user, group=params.user_group, cd_access="a", - recursive=True + recursive=True, + mode=0755, ) Directory(params.ams_collector_pid_dir, http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py index b69d67a..cfe1710 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py @@ -176,12 +176,16 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' if name != "client": Directory( params.hbase_pid_dir, owner = params.hbase_user, - recursive = True + recursive = True, + cd_access = "a", + mode = 0755, ) Directory (params.hbase_log_dir, owner = params.hbase_user, - recursive = True + recursive = True, + cd_access = "a", + mode = 0755, ) if name == "master": http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py index aacb988..6c8d5ff 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py @@ -41,11 +41,17 @@ def falcon(type, action = None, upgrade_type=None): if action == 'config': Directory(params.falcon_pid_dir, owner = params.falcon_user, - recursive = True) + recursive = True, + mode = 0755, + cd_access = "a", + ) Directory(params.falcon_log_dir, owner = params.falcon_user, - recursive = True) + recursive = True, + mode = 0755, + cd_access = "a", + ) Directory(params.falcon_webapp_dir, owner = params.falcon_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py index 055b76e..73556e3 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/knox.py @@ -81,7 +81,9 @@ def knox(): Directory(directory, owner = params.knox_user, group = params.knox_group, - recursive = True + recursive = True, + cd_access = "a", + mode = 0755, ) XmlConfig("gateway-site.xml", http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py index 95dbeac..9395614 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py +++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py @@ -22,7 +22,7 @@ from stacks.utils.RMFTestCase import * @patch("os.path.exists", new = MagicMock(return_value=True)) @patch("platform.linux_distribution", new = MagicMock(return_value="Linux")) -class TestOozieClient(RMFTestCase): +class TestMetricsCollector(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "AMBARI_METRICS/0.1.0/package" STACK_VERSION = "2.0.6" @@ -124,7 +124,8 @@ class TestOozieClient(RMFTestCase): owner = 'ams', group = 'hadoop', cd_access = 'a', - recursive = True + recursive = True, + mode = 0755, ) self.assertResourceCalled('Directory', '/var/run/ambari-metrics-collector', owner = 'ams', @@ -229,11 +230,15 @@ class TestOozieClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/ambari-metrics-collector/', owner = 'ams', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/log/ambari-metrics-collector', owner = 'ams', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) if name == 'master': http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index dd5a550..1a7de71 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py @@ -37,11 +37,15 @@ class TestFalconClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/falcon', owner = 'falcon', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/lib/falcon/webapp', owner = 'falcon', http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index ca97b95..72c8b69 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -81,11 +81,15 @@ class TestFalconServer(RMFTestCase): def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/run/falcon', owner = 'falcon', - recursive = True + recursive = True, + cd_access = "a", + mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', - recursive = True + recursive = True, + cd_access = "a", + mode = 0755, ) self.assertResourceCalled('Directory', '/var/lib/falcon/webapp', owner = 'falcon', @@ -240,10 +244,14 @@ class TestFalconServer(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/falcon', owner = 'falcon', recursive = True, + cd_access = "a", + mode = 0755, ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', recursive = True, + cd_access = "a", + mode = 0755, ) self.assertResourceCalled('Directory', '/usr/hdp/current/falcon-server/webapp', owner = 'falcon', http://git-wip-us.apache.org/repos/asf/ambari/blob/f2dc5174/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py index a2ef976..8b0b55b 100644 --- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py +++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py @@ -42,27 +42,37 @@ class TestKnoxGateway(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data/', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/log/knox', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/run/knox', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf/topologies', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('XmlConfig', 'gateway-site.xml', @@ -483,27 +493,37 @@ class TestKnoxGateway(RMFTestCase): self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/data/', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/log/knox', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/var/run/knox', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('Directory', '/usr/hdp/current/knox-server/conf/topologies', owner = 'knox', group = 'knox', - recursive = True + recursive = True, + mode = 0755, + cd_access = "a", ) self.assertResourceCalled('XmlConfig', 'gateway-site.xml',
