Repository: ambari Updated Branches: refs/heads/branch-2.0.0 167a52307 -> 616d51f32 refs/heads/trunk 96e8bbdf0 -> 72ad30b9a
AMBARI-10013. Nodemanager fails to start with error java.io.IOException: Linux container executor not configured properly (error=24) (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72ad30b9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72ad30b9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72ad30b9 Branch: refs/heads/trunk Commit: 72ad30b9a610d4bf822b61662cc63faff0c3029c Parents: 96e8bbd Author: Andrew Onishuk <[email protected]> Authored: Tue Mar 10 20:54:35 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Tue Mar 10 20:54:35 2015 +0200 ---------------------------------------------------------------------- .../hooks/before-ANY/scripts/shared_initialization.py | 11 ++--------- .../stacks/2.0.6/hooks/before-ANY/test_before_any.py | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/72ad30b9/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py index 8d67320..652e232 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py @@ -145,18 +145,11 @@ def setup_hadoop_env(): Directory(params.hadoop_dir, mode=0755 ) - if stackversion.find('Gluster') >= 0: - Directory(params.hadoop_conf_empty_dir, + Directory(params.hadoop_conf_empty_dir, recursive=True, owner="root", group=params.user_group - ) - else: - Directory(params.hadoop_conf_empty_dir, - recursive=True, - owner=tc_owner, - group=params.user_group - ) + ) Link(params.hadoop_conf_dir, to=params.hadoop_conf_empty_dir, not_if=format("ls {hadoop_conf_dir}") http://git-wip-us.apache.org/repos/asf/ambari/blob/72ad30b9/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py index 5a750d2..6906a97 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py @@ -160,7 +160,7 @@ class TestHookBeforeInstall(RMFTestCase): mode = 0755 ) self.assertResourceCalled('Directory', '/etc/hadoop/conf.empty', - owner = 'hdfs', + owner = 'root', group = 'hadoop', recursive = True, )
