Przeglądaj źródła

AMBARI-13808. Ambari does not change permissions and owner/group for log and PID directories during install (aonishuk)

Andrew Onishuk 9 lat temu
rodzic
commit
6be4969058

+ 6 - 2
ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py

@@ -85,14 +85,18 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or '
     Directory( params.pid_dir,
     Directory( params.pid_dir,
                owner = params.accumulo_user,
                owner = params.accumulo_user,
                group = params.user_group,
                group = params.user_group,
-               recursive = True
+               recursive = True,
+               cd_access = "a",
+               mode = 0755,
     )
     )
 
 
     # create log dir
     # create log dir
     Directory (params.log_dir,
     Directory (params.log_dir,
                owner = params.accumulo_user,
                owner = params.accumulo_user,
                group = params.user_group,
                group = params.user_group,
-               recursive = True
+               recursive = True,
+               cd_access = "a",
+               mode = 0755,
     )
     )
 
 
     # create env file
     # create env file

+ 4 - 1
ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py

@@ -248,7 +248,8 @@ def ams(name=None):
               owner=params.ams_user,
               owner=params.ams_user,
               group=params.user_group,
               group=params.user_group,
               cd_access="a",
               cd_access="a",
-              recursive=True
+              recursive=True,
+              mode=0755,
     )
     )
 
 
     # Hack to allow native HBase libs to be included for embedded hbase
     # Hack to allow native HBase libs to be included for embedded hbase
@@ -333,12 +334,14 @@ def ams(name=None):
     Directory(params.ams_monitor_log_dir,
     Directory(params.ams_monitor_log_dir,
               owner=params.ams_user,
               owner=params.ams_user,
               group=params.user_group,
               group=params.user_group,
+              mode=0755,
               recursive=True
               recursive=True
     )
     )
 
 
     Directory(params.ams_monitor_pid_dir,
     Directory(params.ams_monitor_pid_dir,
               owner=params.ams_user,
               owner=params.ams_user,
               group=params.user_group,
               group=params.user_group,
+              mode=0755,
               recursive=True
               recursive=True
     )
     )
 
 

+ 5 - 1
ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py

@@ -99,7 +99,11 @@ def flume(action = None):
               recursive=True,
               recursive=True,
               owner=params.flume_user,
               owner=params.flume_user,
               )
               )
-    Directory(params.flume_log_dir, owner=params.flume_user)
+    Directory(params.flume_log_dir, 
+              owner=params.flume_user,
+              cd_access="a",
+              mode=0755,
+    )
 
 
     flume_agents = {}
     flume_agents = {}
     if params.flume_conf_content is not None:
     if params.flume_conf_content is not None:

+ 6 - 2
ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py

@@ -153,12 +153,16 @@ def hbase(name=None):
   if name != "client":
   if name != "client":
     Directory( params.pid_dir,
     Directory( params.pid_dir,
       owner = params.hbase_user,
       owner = params.hbase_user,
-      recursive = True
+      recursive = True,
+      cd_access = "a",
+      mode = 0755,
     )
     )
   
   
     Directory (params.log_dir,
     Directory (params.log_dir,
       owner = params.hbase_user,
       owner = params.hbase_user,
-      recursive = True
+      recursive = True,
+      cd_access = "a",
+      mode = 0755,
     )
     )
 
 
   if (params.log4j_props != None):
   if (params.log4j_props != None):

+ 1 - 0
ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py

@@ -64,6 +64,7 @@ def storm(name=None):
             group=params.user_group,
             group=params.user_group,
             recursive=True,
             recursive=True,
             cd_access="a",
             cd_access="a",
+            mode=0755,
   )
   )
 
 
   Directory(params.conf_dir,
   Directory(params.conf_dir,

+ 6 - 3
ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper.py

@@ -59,20 +59,23 @@ def zookeeper(type = None, upgrade_type=None):
   Directory(params.zk_pid_dir,
   Directory(params.zk_pid_dir,
             owner=params.zk_user,
             owner=params.zk_user,
             recursive=True,
             recursive=True,
-            group=params.user_group
+            group=params.user_group,
+            mode=0755,
   )
   )
 
 
   Directory(params.zk_log_dir,
   Directory(params.zk_log_dir,
             owner=params.zk_user,
             owner=params.zk_user,
             recursive=True,
             recursive=True,
-            group=params.user_group
+            group=params.user_group,
+            mode=0755,
   )
   )
 
 
   Directory(params.zk_data_dir,
   Directory(params.zk_data_dir,
             owner=params.zk_user,
             owner=params.zk_user,
             recursive=True,
             recursive=True,
             cd_access="a",
             cd_access="a",
-            group=params.user_group
+            group=params.user_group,
+            mode=0755,
   )
   )
 
 
   if type == 'server':
   if type == 'server':

+ 2 - 1
ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py

@@ -108,7 +108,8 @@ class TestOozieClient(RMFTestCase):
                               owner = 'ams',
                               owner = 'ams',
                               cd_access = 'a',
                               cd_access = 'a',
                               group = 'hadoop',
                               group = 'hadoop',
-                              recursive = True
+                              recursive = True,
+                              mode=0755,
     )
     )
     self.assertResourceCalled('File', '/usr/lib/ams-hbase/bin/hadoop',
     self.assertResourceCalled('File', '/usr/lib/ams-hbase/bin/hadoop',
                               owner = 'ams',
                               owner = 'ams',

+ 11 - 4
ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py

@@ -235,7 +235,10 @@ class TestFlumeHandler(RMFTestCase):
 
 
     self.assertResourceCalled('Directory',
     self.assertResourceCalled('Directory',
                               '/var/log/flume',
                               '/var/log/flume',
-                              owner = 'flume')
+                              owner = 'flume',
+                              cd_access = 'a', 
+                              mode=0755
+    )
 
 
     self.assertResourceCalled('Directory',
     self.assertResourceCalled('Directory',
                               '/etc/flume/conf/a1',
                               '/etc/flume/conf/a1',
@@ -278,7 +281,7 @@ class TestFlumeHandler(RMFTestCase):
                               owner='flume',
                               owner='flume',
                               recursive=True)
                               recursive=True)
 
 
-    self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume')
+    self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume', cd_access = 'a', mode=0755)
 
 
     top = build_flume(self.getConfig()['configurations']['flume-conf']['content'])
     top = build_flume(self.getConfig()['configurations']['flume-conf']['content'])
 
 
@@ -443,7 +446,9 @@ class TestFlumeHandler(RMFTestCase):
 
 
     self.assertResourceCalled('Directory',
     self.assertResourceCalled('Directory',
                               '/var/log/flume',
                               '/var/log/flume',
-                              owner = 'flume')
+                              owner = 'flume',
+                              cd_access = 'a',
+                              mode=0755)
 
 
     self.assertResourceCalled('Directory',
     self.assertResourceCalled('Directory',
                               '/etc/flume/conf/a1',
                               '/etc/flume/conf/a1',
@@ -492,7 +497,9 @@ class TestFlumeHandler(RMFTestCase):
 
 
     self.assertResourceCalled('Directory',
     self.assertResourceCalled('Directory',
                               '/var/log/flume',
                               '/var/log/flume',
-                              owner = 'flume')
+                              owner = 'flume', 
+                              cd_access = 'a', 
+                              mode=0755)
 
 
     self.assertResourceCalled('Directory',
     self.assertResourceCalled('Directory',
                               '/usr/hdp/current/flume-server/conf/a1',
                               '/usr/hdp/current/flume-server/conf/a1',

+ 16 - 2
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py

@@ -307,10 +307,14 @@ class TestHBaseMaster(RMFTestCase):
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/etc/hbase/conf/log4j.properties',
                               '/etc/hbase/conf/log4j.properties',
@@ -444,10 +448,14 @@ class TestHBaseMaster(RMFTestCase):
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/etc/hbase/conf/log4j.properties',
                               '/etc/hbase/conf/log4j.properties',
@@ -586,11 +594,17 @@ class TestHBaseMaster(RMFTestCase):
 
 
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
-      recursive = True)
+      recursive = True,
+      mode = 0755,
+      cd_access = 'a',
+    )
 
 
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
-      recursive = True)
+      recursive = True,
+      mode = 0755,
+      cd_access = 'a',
+    )
 
 
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/usr/hdp/current/hbase-master/conf/log4j.properties',
                               '/usr/hdp/current/hbase-master/conf/log4j.properties',

+ 24 - 4
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py

@@ -207,10 +207,14 @@ class TestHbaseRegionServer(RMFTestCase):
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/etc/hbase/conf/log4j.properties',
                               '/etc/hbase/conf/log4j.properties',
@@ -305,10 +309,14 @@ class TestHbaseRegionServer(RMFTestCase):
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/etc/hbase/conf/log4j.properties',
                               '/etc/hbase/conf/log4j.properties',
@@ -410,11 +418,17 @@ class TestHbaseRegionServer(RMFTestCase):
 
 
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
-      recursive = True)
+      recursive = True,
+      mode = 0755,
+      cd_access = 'a',
+    )
 
 
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
-      recursive = True)
+      recursive = True,
+      mode = 0755,
+      cd_access = 'a',
+    )
 
 
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',
                               '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',
@@ -522,11 +536,17 @@ class TestHbaseRegionServer(RMFTestCase):
 
 
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
-      recursive = True)
+      recursive = True,
+      mode = 0755,
+      cd_access = 'a',
+    )
 
 
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
-      recursive = True)
+      recursive = True,
+      mode = 0755,
+      cd_access = 'a',
+    )
 
 
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',
                               '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',

+ 8 - 0
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py

@@ -301,10 +301,14 @@ class TestPhoenixQueryServer(RMFTestCase):
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
       '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',
       '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',
@@ -413,10 +417,14 @@ class TestPhoenixQueryServer(RMFTestCase):
     self.assertResourceCalled('Directory', '/var/run/hbase',
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('Directory', '/var/log/hbase',
     self.assertResourceCalled('Directory', '/var/log/hbase',
       owner = 'hbase',
       owner = 'hbase',
       recursive = True,
       recursive = True,
+      mode = 0755,
+      cd_access = 'a',
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
       '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',
       '/usr/hdp/current/hbase-regionserver/conf/log4j.properties',

+ 8 - 2
ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py

@@ -62,17 +62,20 @@ class TestZookeeperClient(RMFTestCase):
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode = 0755,
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/etc/zookeeper/conf/log4j.properties',
                               '/etc/zookeeper/conf/log4j.properties',
@@ -122,17 +125,20 @@ class TestZookeeperClient(RMFTestCase):
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode = 0755
     )
     )
     self.assertResourceCalled('File',
     self.assertResourceCalled('File',
                               '/etc/zookeeper/conf/log4j.properties',
                               '/etc/zookeeper/conf/log4j.properties',

+ 8 - 2
ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py

@@ -142,17 +142,20 @@ class TestZookeeperServer(RMFTestCase):
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode = 0755,
     )
     )
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
       content = '1',
       content = '1',
@@ -197,17 +200,20 @@ class TestZookeeperServer(RMFTestCase):
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
     self.assertResourceCalled('Directory', '/var/log/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
+      mode = 0755,
     )
     )
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
     self.assertResourceCalled('Directory', '/hadoop/zookeeper',
       owner = 'zookeeper',
       owner = 'zookeeper',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode = 0755,
     )
     )
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
     self.assertResourceCalled('File', '/hadoop/zookeeper/myid',
       content = '1',
       content = '1',

+ 8 - 4
ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py

@@ -40,13 +40,15 @@ class TestStormBase(RMFTestCase):
       owner = 'storm',
       owner = 'storm',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode=0755,
     )
     )
     self.assertResourceCalled('Directory', '/hadoop/storm',
     self.assertResourceCalled('Directory', '/hadoop/storm',
       owner = 'storm',
       owner = 'storm',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode=0755,
     )
     )
     self.assertResourceCalled('Directory', confDir,
     self.assertResourceCalled('Directory', confDir,
       group = 'hadoop',
       group = 'hadoop',
@@ -81,13 +83,15 @@ class TestStormBase(RMFTestCase):
       owner = 'storm',
       owner = 'storm',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode=0755,
     )
     )
     self.assertResourceCalled('Directory', '/hadoop/storm',
     self.assertResourceCalled('Directory', '/hadoop/storm',
       owner = 'storm',
       owner = 'storm',
       group = 'hadoop',
       group = 'hadoop',
       recursive = True,
       recursive = True,
-      cd_access='a'
+      cd_access='a',
+      mode=0755,
     )
     )
     self.assertResourceCalled('Directory', confDir,
     self.assertResourceCalled('Directory', confDir,
       group = 'hadoop',
       group = 'hadoop',