Просмотр исходного кода

AMBARI-13077. RU: Debian7 fails with multiple service check issues (aonishuk)

Andrew Onishuk 9 лет назад
Родитель
Сommit
542bbf22e8

+ 3 - 1
ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py

@@ -65,7 +65,9 @@ def falcon(type, action = None):
 
     File(params.falcon_conf_dir + '/falcon-env.sh',
       content = InlineTemplate(params.falcon_env_sh_template),
-      owner = params.falcon_user)
+      owner = params.falcon_user,
+      group=params.user_group,
+    )
 
     File(params.falcon_conf_dir + '/client.properties',
       content = Template('client.properties.j2'),

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

@@ -117,7 +117,8 @@ def hbase(name=None):
 
   File(format("{hbase_conf_dir}/hbase-env.sh"),
        owner = params.hbase_user,
-       content=InlineTemplate(params.hbase_env_sh_template)
+       content=InlineTemplate(params.hbase_env_sh_template),
+       group = params.user_group,
   )     
        
   hbase_TemplateConfig( params.metric_prop_file_name,

+ 2 - 1
ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py

@@ -110,7 +110,8 @@ def oozie(is_server=False):
   )
   File(format("{conf_dir}/oozie-env.sh"),
     owner=params.oozie_user,
-    content=InlineTemplate(params.oozie_env_sh_template)
+    content=InlineTemplate(params.oozie_env_sh_template),
+    group=params.user_group,
   )
 
   if (params.log4j_props != None):

+ 2 - 0
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py

@@ -88,6 +88,7 @@ class TestHBaseClient(RMFTestCase):
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
         content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
         owner = 'hbase',
+        group = 'hadoop'
     )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',
@@ -168,6 +169,7 @@ class TestHBaseClient(RMFTestCase):
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
         content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
         owner = 'hbase',
+        group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',

+ 5 - 1
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py

@@ -248,6 +248,7 @@ class TestHBaseMaster(RMFTestCase):
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
       owner = 'hbase',
       content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',
@@ -360,6 +361,7 @@ class TestHBaseMaster(RMFTestCase):
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
       owner = 'hbase',
       content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',
@@ -486,7 +488,9 @@ class TestHBaseMaster(RMFTestCase):
 
     self.assertResourceCalled('File', '/usr/hdp/current/hbase-master/conf/hbase-env.sh',
       owner = 'hbase',
-      content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']))
+      content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop'
+    )
 
     self.assertResourceCalled('TemplateConfig', '/usr/hdp/current/hbase-master/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',

+ 5 - 1
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py

@@ -175,6 +175,7 @@ class TestHbaseRegionServer(RMFTestCase):
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
       owner = 'hbase',
       content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',
@@ -251,6 +252,7 @@ class TestHbaseRegionServer(RMFTestCase):
     self.assertResourceCalled('File', '/etc/hbase/conf/hbase-env.sh',
       owner = 'hbase',
       content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig', '/etc/hbase/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',
@@ -341,7 +343,9 @@ class TestHbaseRegionServer(RMFTestCase):
 
     self.assertResourceCalled('File', '/usr/hdp/current/hbase-regionserver/conf/hbase-env.sh',
       owner = 'hbase',
-      content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']))
+      content = InlineTemplate(self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop'
+    )
 
     self.assertResourceCalled('TemplateConfig', '/usr/hdp/current/hbase-regionserver/conf/hadoop-metrics2-hbase.properties',
       owner = 'hbase',

+ 5 - 1
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py

@@ -181,7 +181,9 @@ class TestPhoenixQueryServer(RMFTestCase):
       '/usr/hdp/current/hbase-regionserver/conf/hbase-env.sh',
       owner = 'hbase',
       content = InlineTemplate(
-        self.getConfig()['configurations']['hbase-env']['content']))
+        self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'haoop',                          
+    )
 
     self.assertResourceCalled('Directory', '/var/run/hbase',
       owner = 'hbase',
@@ -267,6 +269,7 @@ class TestPhoenixQueryServer(RMFTestCase):
       owner = 'hbase',
       content = InlineTemplate(
         self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig',
       '/usr/hdp/current/hbase-regionserver/conf/hadoop-metrics2-hbase.properties',
@@ -356,6 +359,7 @@ class TestPhoenixQueryServer(RMFTestCase):
       owner = 'hbase',
       content = InlineTemplate(
         self.getConfig()['configurations']['hbase-env']['content']),
+      group = 'hadoop',
     )
     self.assertResourceCalled('TemplateConfig',
       '/usr/hdp/current/hbase-regionserver/conf/hadoop-metrics2-hbase.properties',

+ 6 - 3
ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py

@@ -49,7 +49,8 @@ class TestOozieClient(RMFTestCase):
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
+                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+                              group = 'hadoop',
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
@@ -103,7 +104,8 @@ class TestOozieClient(RMFTestCase):
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
+                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+                              group = 'hadoop',
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
@@ -163,7 +165,8 @@ class TestOozieClient(RMFTestCase):
     )
     self.assertResourceCalled('File', '/usr/hdp/current/oozie-client/conf/oozie-env.sh',
                               owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
+                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+                              group = 'hadoop',
     )
     self.assertResourceCalled('File', '/usr/hdp/current/oozie-client/conf/oozie-log4j.properties',
                               owner = 'oozie',

+ 6 - 2
ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py

@@ -101,6 +101,7 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
                               content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
                               owner = 'oozie',
+                              group = 'hadoop',
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               content = 'log4jproperties\nline2',
@@ -306,6 +307,7 @@ class TestOozieServer(RMFTestCase):
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
                               content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
                               owner = 'oozie',
+                              group = 'hadoop',
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               content = 'log4jproperties\nline2',
@@ -658,7 +660,8 @@ class TestOozieServer(RMFTestCase):
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
+                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+                              group = 'hadoop',
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',
@@ -834,7 +837,8 @@ class TestOozieServer(RMFTestCase):
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
                               owner = 'oozie',
-                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content'])
+                              content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+                              group = 'hadoop',
                               )
     self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
                               owner = 'oozie',

+ 2 - 1
ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py

@@ -61,7 +61,8 @@ class TestFalconClient(RMFTestCase):
                               )
     self.assertResourceCalled('File', '/etc/falcon/conf/falcon-env.sh',
                               content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']),
-                              owner = 'falcon'
+                              owner = 'falcon',
+                              group = 'hadoop'
                               )
     self.assertResourceCalled('File', '/etc/falcon/conf/client.properties',
                               content = Template('client.properties.j2'),

+ 3 - 1
ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py

@@ -105,7 +105,8 @@ class TestFalconServer(RMFTestCase):
     )
     self.assertResourceCalled('File', '/etc/falcon/conf/falcon-env.sh',
                               content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']),
-                              owner = 'falcon'
+                              owner = 'falcon',
+                              group = 'hadoop'
                               )
     self.assertResourceCalled('File', '/etc/falcon/conf/client.properties',
                               content = Template('client.properties.j2'),
@@ -263,6 +264,7 @@ class TestFalconServer(RMFTestCase):
     self.assertResourceCalled('File', '/usr/hdp/current/falcon-server/conf/falcon-env.sh',
         owner = 'falcon',
         content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']),
+        group = 'hadoop'
     )
     self.assertResourceCalled('File', '/usr/hdp/current/falcon-server/conf/client.properties',
         owner = 'falcon',