You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by lp...@apache.org on 2017/09/12 10:04:56 UTC

[39/57] [abbrv] ambari git commit: AMBARI-21896. Ambari should honor permissions specified for dfs.datanode.data.dir.perm when creating datanode dir's (aonishuk)

AMBARI-21896. Ambari should honor permissions specified for dfs.datanode.data.dir.perm when creating datanode dir's (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ac4340e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ac4340e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ac4340e

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3ac4340e6a14610bb7687c91a01362ec10837488
Parents: 4bbbe1f
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Sep 11 14:59:24 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Sep 11 14:59:24 2017 +0300

----------------------------------------------------------------------
 .../HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py              | 2 +-
 .../HDFS/2.1.0.2.0/package/scripts/params_linux.py               | 2 ++
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac4340e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py
index 2d3d4f5..c61a117 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_datanode.py
@@ -34,7 +34,7 @@ def create_dirs(data_dir):
   Directory(data_dir,
             create_parents = True,
             cd_access="a",
-            mode=0755,
+            mode=params.dfs_data_dirs_perm,
             owner=params.hdfs_user,
             group=params.user_group,
             ignore_failures=True

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac4340e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index 256211f..76b430b 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -277,6 +277,8 @@ else:
 fs_checkpoint_dirs = default("/configurations/hdfs-site/dfs.namenode.checkpoint.dir", "").split(',')
 
 dfs_data_dirs = config['configurations']['hdfs-site']['dfs.datanode.data.dir']
+dfs_data_dirs_perm = default("/configurations/hdfs-site/dfs.datanode.data.dir.perm", "755")
+dfs_data_dirs_perm = int(dfs_data_dirs_perm, base=8) # convert int from octal representation
 
 data_dir_mount_file = "/var/lib/ambari-agent/data/datanode/dfs_data_dir_mount.hist"
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac4340e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
index 966254a..24b0347 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
@@ -377,7 +377,7 @@ class TestDatanode(RMFTestCase):
                               owner = 'hdfs',
                               ignore_failures = True,
                               group = 'hadoop',
-                              mode = 0755,
+                              mode = 0750,
                               create_parents = True,
                               cd_access='a'
                               )
@@ -463,7 +463,7 @@ class TestDatanode(RMFTestCase):
                               owner = 'hdfs',
                               ignore_failures = True,
                               group = 'hadoop',
-                              mode = 0755,
+                              mode = 0750,
                               create_parents = True,
                               cd_access='a'
                               )