AMBARI-13077. RU: Debian7 fails with multiple service check issues (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c4ae9cc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c4ae9cc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c4ae9cc Branch: refs/heads/branch-2.1 Commit: 3c4ae9cc77c0ebbbf3b49b61488c35f549fa93c9 Parents: 28689a8 Author: Andrew Onishuk <[email protected]> Authored: Fri Sep 11 21:50:47 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Fri Sep 11 21:50:47 2015 +0300 ---------------------------------------------------------------------- .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 4 +++- .../HBASE/0.96.0.2.0/package/scripts/hbase.py | 3 ++- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 3 ++- .../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 2 ++ .../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 6 +++++- .../python/stacks/2.0.6/HBASE/test_hbase_regionserver.py | 6 +++++- .../python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 6 +++++- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py | 9 ++++++--- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 8 ++++++-- .../src/test/python/stacks/2.1/FALCON/test_falcon_client.py | 3 ++- .../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 4 +++- 11 files changed, 41 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py index 38c806b..e4edcff 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py +++ b/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'), http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py index 793a44b..991f4e7 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py +++ b/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, http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py index 2cee73e..ba56c26 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py +++ b/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): http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py index d2fa8ab..ff25933 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index c4ff3dc..8f56e8f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py index 59f8a8f..2cb05c0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py index 1711f69..64e7845 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py @@ -180,7 +180,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', @@ -266,6 +268,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', @@ -355,6 +358,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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index 4fcfb33..e8196d6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index 3341511..0ce5ce7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index 17c6137..9b08a90 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/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'), http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4ae9cc/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index 11570ed..793e8dc 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/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',
