You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/04/16 01:58:17 UTC
git commit: AMBARI-5476. Change permissions for
/var/log/hadoop/mapred/userlogs/*.
Repository: ambari
Updated Branches:
refs/heads/trunk 71aa1f24c -> 829bb4507
AMBARI-5476. Change permissions for /var/log/hadoop/mapred/userlogs/*.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/829bb450
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/829bb450
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/829bb450
Branch: refs/heads/trunk
Commit: 829bb45071f3454a964b7930b6a0a2dcb196b6fa
Parents: 71aa1f2
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Apr 15 16:55:19 2014 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Apr 15 16:55:19 2014 -0700
----------------------------------------------------------------------
.../1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py | 7 ++++++-
.../python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py | 8 ++++++++
.../stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py | 8 ++++++++
.../stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py | 8 ++++++++
.../stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py | 8 ++++++++
5 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/829bb450/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
index 94fe24e..4b26814 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
@@ -63,12 +63,17 @@ def mapreduce(name=None):
)
mapred_log_dir = os.path.join(params.mapred_log_dir_prefix, params.mapred_user)
+ mapred_userlogs_dir = os.path.join(mapred_log_dir, "userlogs")
+
Directory(mapred_log_dir,
recursive=True,
owner=params.mapred_user,
group=params.user_group
)
-
+ Directory(mapred_userlogs_dir,
+ recursive=True,
+ mode = 01777
+ )
if name == 'jobtracker':
File(os.path.join(mapred_log_dir, 'hadoop-mapreduce.jobsummary.log'),
owner=params.mapred_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/829bb450/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
index 3606595..d581903 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
@@ -38,6 +38,10 @@ class TestMapreduceClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('Directory', '/hadoop/mapred',
owner = 'mapred',
recursive = True,
@@ -77,6 +81,10 @@ class TestMapreduceClient(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('Directory', '/hadoop/mapred',
owner = 'mapred',
recursive = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/829bb450/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
index 7367b82..d22f4ba 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
@@ -174,6 +174,10 @@ class TestHistoryServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('Directory', '/hadoop/mapred',
owner = 'mapred',
recursive = True,
@@ -263,6 +267,10 @@ class TestHistoryServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('Directory', '/hadoop/mapred',
owner = 'mapred',
recursive = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/829bb450/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
index faa27fd..255ba1a 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
@@ -228,6 +228,10 @@ class TestJobtracker(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('File', '/var/log/hadoop/mapred/hadoop-mapreduce.jobsummary.log',
owner = 'mapred',
group = 'hadoop',
@@ -322,6 +326,10 @@ class TestJobtracker(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('File', '/var/log/hadoop/mapred/hadoop-mapreduce.jobsummary.log',
owner = 'mapred',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/829bb450/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
index d725c90..bab7f71 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
@@ -117,6 +117,10 @@ class TestTasktracker(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('Directory', '/hadoop/mapred',
owner = 'mapred',
recursive = True,
@@ -149,6 +153,10 @@ class TestTasktracker(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/var/log/hadoop/mapred/userlogs',
+ mode = 01777,
+ recursive = True,
+ )
self.assertResourceCalled('Directory', '/hadoop/mapred',
owner = 'mapred',
recursive = True,