You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2016/12/23 17:40:03 UTC
ambari git commit: AMBARI-19005. "conf.server" dir for HIVE1 and
HIVE2 should have 700 permission and files in it should have 600
permission.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk b536a9cbc -> 7c2c14d97
AMBARI-19005. "conf.server" dir for HIVE1 and HIVE2 should have 700 permission and files in it should have 600 permission.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c2c14d9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c2c14d9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c2c14d9
Branch: refs/heads/trunk
Commit: 7c2c14d976b2099876f1e801a8ddd60c7549c0fc
Parents: b536a9c
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Dec 23 19:38:41 2016 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Dec 23 19:39:22 2016 +0200
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 39 ++--
.../package/scripts/hive_interactive.py | 20 +-
.../stacks/2.0.6/HIVE/test_hive_client.py | 12 +-
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 33 ++-
.../stacks/2.0.6/HIVE/test_hive_server.py | 28 ++-
.../stacks/2.1/HIVE/test_hive_metastore.py | 21 +-
.../stacks/2.5/HIVE/test_hive_server_int.py | 208 +++++++++++++------
7 files changed, 248 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index ffc996c..6344ed7 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -65,7 +65,7 @@ def hive(name=None):
configuration_attributes=params.config['configuration_attributes']['hive-site'],
owner=params.hive_user,
group=params.user_group,
- mode=0644)
+ mode=0600)
# Generate atlas-application.properties.xml file
if params.enable_atlas_hook:
@@ -75,7 +75,8 @@ def hive(name=None):
File(format("{hive_config_dir}/hive-env.sh"),
owner=params.hive_user,
group=params.user_group,
- content=InlineTemplate(params.hive_env_sh_template)
+ content=InlineTemplate(params.hive_env_sh_template),
+ mode=0600
)
# On some OS this folder could be not exists, so we will create it before pushing there files
@@ -115,7 +116,8 @@ def setup_hiveserver2():
File(os.path.join(params.hive_server_conf_dir, "hadoop-metrics2-hiveserver2.properties"),
owner=params.hive_user,
group=params.user_group,
- content=Template("hadoop-metrics2-hiveserver2.properties.j2")
+ content=Template("hadoop-metrics2-hiveserver2.properties.j2"),
+ mode=0600
)
XmlConfig("hiveserver2-site.xml",
conf_dir=params.hive_server_conf_dir,
@@ -123,7 +125,7 @@ def setup_hiveserver2():
configuration_attributes=params.config['configuration_attributes']['hiveserver2-site'],
owner=params.hive_user,
group=params.user_group,
- mode=0644)
+ mode=0600)
# copy tarball to HDFS feature not supported
if not (params.stack_version_formatted_major and check_stack_feature(StackFeature.COPY_TARBALL_TO_HDFS, params.stack_version_formatted_major)):
@@ -264,12 +266,13 @@ def setup_metastore():
configuration_attributes=params.config['configuration_attributes']['hivemetastore-site'],
owner=params.hive_user,
group=params.user_group,
- mode=0644)
+ mode=0600)
File(os.path.join(params.hive_server_conf_dir, "hadoop-metrics2-hivemetastore.properties"),
owner=params.hive_user,
group=params.user_group,
- content=Template("hadoop-metrics2-hivemetastore.properties.j2")
+ content=Template("hadoop-metrics2-hivemetastore.properties.j2"),
+ mode=0600
)
File(params.start_metastore_path,
@@ -308,11 +311,15 @@ Writes configuration files required by Hive.
"""
def fill_conf_dir(component_conf_dir):
import params
-
+ hive_client_conf_path = os.path.realpath(format("{stack_root}/current/{component_directory}/conf"))
+ component_conf_dir = os.path.realpath(component_conf_dir)
+ mode_identified_for_file = 0644 if component_conf_dir == hive_client_conf_path else 0600
+ mode_identified_for_dir = 0755 if component_conf_dir == hive_client_conf_path else 0700
Directory(component_conf_dir,
owner=params.hive_user,
group=params.user_group,
- create_parents = True
+ create_parents = True,
+ mode=mode_identified_for_dir
)
XmlConfig("mapred-site.xml",
@@ -321,17 +328,19 @@ def fill_conf_dir(component_conf_dir):
configuration_attributes=params.config['configuration_attributes']['mapred-site'],
owner=params.hive_user,
group=params.user_group,
- mode=0644)
+ mode=mode_identified_for_file)
File(format("{component_conf_dir}/hive-default.xml.template"),
owner=params.hive_user,
- group=params.user_group
+ group=params.user_group,
+ mode=mode_identified_for_file
)
File(format("{component_conf_dir}/hive-env.sh.template"),
owner=params.hive_user,
- group=params.user_group
+ group=params.user_group,
+ mode=mode_identified_for_file
)
# Create hive-log4j.properties and hive-exec-log4j.properties
@@ -340,14 +349,14 @@ def fill_conf_dir(component_conf_dir):
log4j_exec_filename = 'hive-exec-log4j.properties'
if (params.log4j_exec_props != None):
File(format("{component_conf_dir}/{log4j_exec_filename}"),
- mode=0644,
+ mode=mode_identified_for_file,
group=params.user_group,
owner=params.hive_user,
content=params.log4j_exec_props
)
elif (os.path.exists("{component_conf_dir}/{log4j_exec_filename}.template")):
File(format("{component_conf_dir}/{log4j_exec_filename}"),
- mode=0644,
+ mode=mode_identified_for_file,
group=params.user_group,
owner=params.hive_user,
content=StaticFile(format("{component_conf_dir}/{log4j_exec_filename}.template"))
@@ -356,14 +365,14 @@ def fill_conf_dir(component_conf_dir):
log4j_filename = 'hive-log4j.properties'
if (params.log4j_props != None):
File(format("{component_conf_dir}/{log4j_filename}"),
- mode=0644,
+ mode=mode_identified_for_file,
group=params.user_group,
owner=params.hive_user,
content=params.log4j_props
)
elif (os.path.exists("{component_conf_dir}/{log4j_filename}.template")):
File(format("{component_conf_dir}/{log4j_filename}"),
- mode=0644,
+ mode=mode_identified_for_file,
group=params.user_group,
owner=params.hive_user,
content=StaticFile(format("{component_conf_dir}/{log4j_filename}.template"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
index af2a05d..b2a76af 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
@@ -176,6 +176,7 @@ def hive_interactive(name=None):
del merged_hive_interactive_site_copy[item]
for conf_dir in hive2_conf_dirs_list:
+ mode_identified = 0644 if conf_dir == hive2_client_conf_path else 0600
if conf_dir == hive2_client_conf_path:
XmlConfig("hive-site.xml",
conf_dir=conf_dir,
@@ -191,54 +192,54 @@ def hive_interactive(name=None):
configuration_attributes=params.config['configuration_attributes']['hive-interactive-site'],
owner=params.hive_user,
group=params.user_group,
- mode=0644)
-
+ mode=0600)
XmlConfig("hiveserver2-site.xml",
conf_dir=conf_dir,
configurations=merged_hiveserver2_interactive_site,
configuration_attributes=params.config['configuration_attributes']['hiveserver2-interactive-site'],
owner=params.hive_user,
group=params.user_group,
- mode=0644)
+ mode=mode_identified)
hive_server_interactive_conf_dir = conf_dir
File(format("{hive_server_interactive_conf_dir}/hive-env.sh"),
owner=params.hive_user,
group=params.user_group,
+ mode=mode_identified,
content=InlineTemplate(params.hive_interactive_env_sh_template))
llap_daemon_log4j_filename = 'llap-daemon-log4j2.properties'
File(format("{hive_server_interactive_conf_dir}/{llap_daemon_log4j_filename}"),
- mode=0644,
+ mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
content=params.llap_daemon_log4j)
llap_cli_log4j2_filename = 'llap-cli-log4j2.properties'
File(format("{hive_server_interactive_conf_dir}/{llap_cli_log4j2_filename}"),
- mode=0644,
+ mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
content=params.llap_cli_log4j2)
hive_log4j2_filename = 'hive-log4j2.properties'
File(format("{hive_server_interactive_conf_dir}/{hive_log4j2_filename}"),
- mode=0644,
+ mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
content=params.hive_log4j2)
hive_exec_log4j2_filename = 'hive-exec-log4j2.properties'
File(format("{hive_server_interactive_conf_dir}/{hive_exec_log4j2_filename}"),
- mode=0644,
+ mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
content=params.hive_exec_log4j2)
beeline_log4j2_filename = 'beeline-log4j2.properties'
File(format("{hive_server_interactive_conf_dir}/{beeline_log4j2_filename}"),
- mode=0644,
+ mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
content=params.beeline_log4j2)
@@ -246,17 +247,20 @@ def hive_interactive(name=None):
File(os.path.join(hive_server_interactive_conf_dir, "hadoop-metrics2-hiveserver2.properties"),
owner=params.hive_user,
group=params.user_group,
+ mode=mode_identified,
content=Template("hadoop-metrics2-hiveserver2.properties.j2")
)
File(format("{hive_server_interactive_conf_dir}/hadoop-metrics2-llapdaemon.properties"),
owner=params.hive_user,
group=params.user_group,
+ mode=mode_identified,
content=Template("hadoop-metrics2-llapdaemon.j2"))
File(format("{hive_server_interactive_conf_dir}/hadoop-metrics2-llaptaskscheduler.properties"),
owner=params.hive_user,
group=params.user_group,
+ mode=mode_identified,
content=Template("hadoop-metrics2-llaptaskscheduler.j2"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
index b96437d..1a7256f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
@@ -40,6 +40,7 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -52,10 +53,12 @@ class TestHiveClient(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-env.sh.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-exec-log4j.properties',
content = 'log4jproperties\nline2',
@@ -72,7 +75,7 @@ class TestHiveClient(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/usr/hdp/current/hive-client/conf',
- mode = 0644,
+ mode = 0600,
configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'],
owner = 'hive',
configurations = self.getConfig()['configurations']['hive-site'],
@@ -81,6 +84,7 @@ class TestHiveClient(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
group = 'hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
@@ -116,6 +120,7 @@ class TestHiveClient(RMFTestCase):
owner = 'hive',
group = 'hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -128,10 +133,12 @@ class TestHiveClient(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-env.sh.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-exec-log4j.properties',
content = 'log4jproperties\nline2',
@@ -148,7 +155,7 @@ class TestHiveClient(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/usr/hdp/current/hive-client/conf',
- mode = 0644,
+ mode = 0600,
configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'],
owner = 'hive',
configurations = self.getConfig()['configurations']['hive-site'],
@@ -157,6 +164,7 @@ class TestHiveClient(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
group = 'hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
index 799ee39..4d0f89f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
@@ -156,6 +156,7 @@ class TestHiveMetastore(RMFTestCase):
owner = 'hive',
group = 'hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -169,10 +170,12 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties',
content = 'log4jproperties\nline2',
@@ -189,7 +192,7 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/etc/hive/conf.server',
- mode = 0644,
+ mode = 0600,
configuration_attributes = {u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -200,6 +203,7 @@ class TestHiveMetastore(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
group = 'hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
@@ -253,7 +257,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/etc/hive/conf.server/hadoop-metrics2-hivemetastore.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hivemetastore.properties.j2')
+ content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
@@ -272,6 +277,7 @@ class TestHiveMetastore(RMFTestCase):
owner = 'hive',
group = 'hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -285,10 +291,12 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties',
content = 'log4jproperties\nline2',
@@ -305,7 +313,7 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/etc/hive/conf.server',
- mode = 0644,
+ mode = 0600,
configuration_attributes = {u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -316,6 +324,7 @@ class TestHiveMetastore(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
group = 'hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
@@ -366,7 +375,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/etc/hive/conf.server/hadoop-metrics2-hivemetastore.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hivemetastore.properties.j2')
+ content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
@@ -409,7 +419,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('Directory', '/usr/hdp/current/hive-server2/conf',
owner = 'hive',
group = 'hadoop',
- create_parents = True)
+ create_parents = True,
+ mode = 0755)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -423,11 +434,13 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner = 'hive',
- group = 'hadoop')
+ group = 'hadoop',
+ mode = 0644)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties',
content = 'log4jproperties\nline2',
@@ -444,7 +457,7 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/usr/hdp/current/hive-server2/conf/conf.server',
- mode = 0644,
+ mode = 0600,
configuration_attributes = {u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -454,7 +467,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/conf.server/hive-env.sh',
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
- group = 'hadoop')
+ group = 'hadoop',
+ mode = 0600)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
@@ -506,7 +520,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/conf.server/hadoop-metrics2-hivemetastore.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hivemetastore.properties.j2')
+ content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 8b866d6..36fcc52 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -334,6 +334,7 @@ class TestHiveServer(RMFTestCase):
owner='hive',
group='hadoop',
create_parents = True,
+ mode = 0755
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
@@ -348,10 +349,12 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner='hive',
group='hadoop',
+ mode=0644
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner='hive',
group='hadoop',
+ mode=0644
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties',
content='log4jproperties\nline2',
@@ -368,7 +371,7 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group='hadoop',
conf_dir='/etc/hive/conf.server',
- mode=0644,
+ mode=0600,
configuration_attributes={u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -379,6 +382,7 @@ class TestHiveServer(RMFTestCase):
content=InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner='hive',
group='hadoop',
+ mode = 0600
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner='root',
@@ -434,12 +438,13 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('File', '/etc/hive/conf.server/hadoop-metrics2-hiveserver2.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hiveserver2.properties.j2')
+ content = Template('hadoop-metrics2-hiveserver2.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('XmlConfig', 'hiveserver2-site.xml',
group = 'hadoop',
conf_dir = '/etc/hive/conf.server',
- mode = 0644,
+ mode = 0600,
owner = 'hive',
configuration_attributes = self.getConfig()['configuration_attributes']['hiveserver2-site'],
configurations = self.getConfig()['configurations']['hiveserver2-site'],
@@ -538,6 +543,7 @@ class TestHiveServer(RMFTestCase):
owner='hive',
group='hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group='hadoop',
@@ -551,10 +557,12 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner='hive',
group='hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner='hive',
group='hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties',
content='log4jproperties\nline2',
@@ -571,7 +579,7 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group='hadoop',
conf_dir='/etc/hive/conf.server',
- mode=0644,
+ mode=0600,
configuration_attributes={u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -582,6 +590,7 @@ class TestHiveServer(RMFTestCase):
content=InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner='hive',
group='hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner='root',
@@ -602,21 +611,21 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Directory', '/var/run/hive',
owner='hive',
group='hadoop',
- mode=0755,
+ mode = 0755,
create_parents = True,
cd_access='a',
)
self.assertResourceCalled('Directory', '/var/log/hive',
owner='hive',
group='hadoop',
- mode=0755,
+ mode = 0755,
create_parents = True,
cd_access='a',
)
self.assertResourceCalled('Directory', '/var/lib/hive',
owner='hive',
group='hadoop',
- mode=0755,
+ mode = 0755,
create_parents = True,
cd_access='a',
)
@@ -637,12 +646,13 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('File', '/etc/hive/conf.server/hadoop-metrics2-hiveserver2.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hiveserver2.properties.j2')
+ content = Template('hadoop-metrics2-hiveserver2.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('XmlConfig', 'hiveserver2-site.xml',
group = 'hadoop',
conf_dir = '/etc/hive/conf.server',
- mode = 0644,
+ mode = 0600,
owner = 'hive',
configuration_attributes = self.getConfig()['configuration_attributes']['hiveserver2-site'],
configurations = self.getConfig()['configurations']['hiveserver2-site'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
index 5ee09f6..bbacbf5 100644
--- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
@@ -194,6 +194,7 @@ class TestHiveMetastore(RMFTestCase):
owner = 'hive',
group = 'hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -207,15 +208,17 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/etc/hive/conf.server',
- mode = 0644,
+ mode = 0600,
configuration_attributes = {u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -226,6 +229,7 @@ class TestHiveMetastore(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
group = 'hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
@@ -276,7 +280,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/etc/hive/conf.server/hadoop-metrics2-hivemetastore.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hivemetastore.properties.j2')
+ content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
@@ -295,6 +300,7 @@ class TestHiveMetastore(RMFTestCase):
owner = 'hive',
group = 'hadoop',
create_parents = True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group = 'hadoop',
@@ -308,15 +314,17 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-default.xml.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-env.sh.template',
owner = 'hive',
group = 'hadoop',
+ mode = 0644,
)
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group = 'hadoop',
conf_dir = '/etc/hive/conf.server',
- mode = 0644,
+ mode = 0600,
configuration_attributes = {u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -327,6 +335,7 @@ class TestHiveMetastore(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['hive-env']['content']),
owner = 'hive',
group = 'hadoop',
+ mode = 0600,
)
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
@@ -377,7 +386,8 @@ class TestHiveMetastore(RMFTestCase):
self.assertResourceCalled('File', '/etc/hive/conf.server/hadoop-metrics2-hivemetastore.properties',
owner = 'hive',
group = 'hadoop',
- content = Template('hadoop-metrics2-hivemetastore.properties.j2')
+ content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
+ mode = 0600,
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
@@ -686,6 +696,7 @@ class TestHiveMetastore(RMFTestCase):
content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
owner = 'hive',
group = 'hadoop',
+ mode = 0600
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
@@ -777,6 +788,7 @@ class TestHiveMetastore(RMFTestCase):
content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
owner = 'hive',
group = 'hadoop',
+ mode = 0600
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
@@ -896,6 +908,7 @@ class TestHiveMetastore(RMFTestCase):
content = Template('hadoop-metrics2-hivemetastore.properties.j2'),
owner = 'hive',
group = 'hadoop',
+ mode = 0600
)
self.assertResourceCalled('File', '/tmp/start_metastore_script',
content = StaticFile('startMetastore.sh'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c2c14d9/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index e00668a..8c47d99 100644
--- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
+++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
@@ -360,6 +360,7 @@ class TestHiveServerInteractive(RMFTestCase):
owner='hive',
group='hadoop',
create_parents=True,
+ mode = 0755,
)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group='hadoop',
@@ -373,10 +374,12 @@ class TestHiveServerInteractive(RMFTestCase):
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2-hive2/conf/hive-default.xml.template',
owner='hive',
group='hadoop',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/hive-server2-hive2/conf/hive-env.sh.template',
owner='hive',
group='hadoop',
+ mode = 0644,
)
hive_site_conf = {}
hive_site_conf.update(self.getConfig()['configurations']['hive-site'])
@@ -397,12 +400,13 @@ class TestHiveServerInteractive(RMFTestCase):
self.assertResourceCalled("Directory", "/usr/hdp/current/hive-server2-hive2/conf/conf.server",
owner=u"hive",
group=u"hadoop",
- create_parents=True)
+ create_parents=True,
+ mode = 0700)
self.assertResourceCalled('XmlConfig', 'mapred-site.xml',
group='hadoop',
conf_dir='/usr/hdp/current/hive-server2-hive2/conf/conf.server',
- mode=0644,
+ mode=0600,
configuration_attributes={u'final': {u'mapred.healthChecker.script.path': u'true',
u'mapreduce.jobtracker.staging.root.dir': u'true'}},
owner='hive',
@@ -411,11 +415,13 @@ class TestHiveServerInteractive(RMFTestCase):
self.assertResourceCalled("File", "/usr/hdp/current/hive-server2-hive2/conf/conf.server/hive-default.xml.template",
owner=u"hive",
- group=u"hadoop")
+ group=u"hadoop",
+ mode = 0600)
self.assertResourceCalled("File", "/usr/hdp/current/hive-server2-hive2/conf/conf.server/hive-env.sh.template",
owner=u"hive",
- group=u"hadoop")
+ group=u"hadoop",
+ mode = 0600)
self.assertResourceCalled('XmlConfig', 'tez-site.xml',
group='hadoop',
conf_dir='/etc/tez_hive2/conf',
@@ -450,7 +456,7 @@ class TestHiveServerInteractive(RMFTestCase):
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
group='hadoop',
conf_dir=conf_dir,
- mode=0644,
+ mode=0600,
configuration_attributes={u'final': {u'hive.optimize.bucketmapjoin.sortedmerge': u'true',
u'javax.jdo.option.ConnectionDriverName': u'true',
u'javax.jdo.option.ConnectionPassword': u'true'}},
@@ -458,66 +464,136 @@ class TestHiveServerInteractive(RMFTestCase):
configurations=hive_site_conf,
)
- self.assertResourceCalled('XmlConfig', 'hiveserver2-site.xml',
- group='hadoop',
- conf_dir=conf_dir,
- mode=0644,
- configuration_attributes={},
- owner='hive',
- configurations=hiveserver2_site_conf,
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-env.sh'),
- content=InlineTemplate(self.getConfig()['configurations']['hive-interactive-env']['content']),
- owner='hive',
- group='hadoop',
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-daemon-log4j2.properties'),
- content='con\ntent',
- owner='hive',
- group='hadoop',
- mode=0644,
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-cli-log4j2.properties'),
- content='con\ntent',
- owner='hive',
- group='hadoop',
- mode=0644,
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-log4j2.properties'),
- content='con\ntent', # Test new line
- owner='hive',
- group='hadoop',
- mode=0644,
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-exec-log4j2.properties'),
- content='con\ntent', # Test new line
- owner='hive',
- group='hadoop',
- mode=0644,
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'beeline-log4j2.properties'),
- content='con\ntent', # Test new line
- owner='hive',
- group='hadoop',
- mode=0644,
- )
- self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-hiveserver2.properties'),
- content=Template("hadoop-metrics2-hiveserver2.properties.j2"),
- owner='hive',
- group='hadoop'
- )
-
- self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llapdaemon.properties'),
- content=Template("hadoop-metrics2-llapdaemon.j2"),
- owner='hive',
- group='hadoop'
- )
-
- self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llaptaskscheduler.properties'),
- content=Template("hadoop-metrics2-llaptaskscheduler.j2"),
- owner='hive',
- group='hadoop'
- )
+ if conf_dir == '/usr/hdp/current/hive-server2-hive2/conf/conf.server':
+ self.assertResourceCalled('XmlConfig', 'hiveserver2-site.xml',
+ group='hadoop',
+ conf_dir=conf_dir,
+ mode=0600,
+ configuration_attributes={},
+ owner='hive',
+ configurations=hiveserver2_site_conf,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-env.sh'),
+ content=InlineTemplate(self.getConfig()['configurations']['hive-interactive-env']['content']),
+ owner='hive',
+ group='hadoop',
+ mode = 0600,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-daemon-log4j2.properties'),
+ content='con\ntent',
+ owner='hive',
+ group='hadoop',
+ mode=0600,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-cli-log4j2.properties'),
+ content='con\ntent',
+ owner='hive',
+ group='hadoop',
+ mode=0600,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-log4j2.properties'),
+ content='con\ntent', # Test new line
+ owner='hive',
+ group='hadoop',
+ mode=0600,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-exec-log4j2.properties'),
+ content='con\ntent', # Test new line
+ owner='hive',
+ group='hadoop',
+ mode=0600,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'beeline-log4j2.properties'),
+ content='con\ntent', # Test new line
+ owner='hive',
+ group='hadoop',
+ mode=0600,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-hiveserver2.properties'),
+ content=Template("hadoop-metrics2-hiveserver2.properties.j2"),
+ owner='hive',
+ group='hadoop',
+ mode = 0600,
+ )
+
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llapdaemon.properties'),
+ content=Template("hadoop-metrics2-llapdaemon.j2"),
+ owner='hive',
+ group='hadoop',
+ mode = 0600
+ )
+
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llaptaskscheduler.properties'),
+ content=Template("hadoop-metrics2-llaptaskscheduler.j2"),
+ owner='hive',
+ group='hadoop',
+ mode = 0600
+ )
+ else:
+ self.assertResourceCalled('XmlConfig', 'hiveserver2-site.xml',
+ group='hadoop',
+ conf_dir=conf_dir,
+ mode=0644,
+ configuration_attributes={},
+ owner='hive',
+ configurations=hiveserver2_site_conf,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-env.sh'),
+ content=InlineTemplate(self.getConfig()['configurations']['hive-interactive-env']['content']),
+ owner='hive',
+ group='hadoop',
+ mode = 0644,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-daemon-log4j2.properties'),
+ content='con\ntent',
+ owner='hive',
+ group='hadoop',
+ mode=0644,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'llap-cli-log4j2.properties'),
+ content='con\ntent',
+ owner='hive',
+ group='hadoop',
+ mode=0644,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-log4j2.properties'),
+ content='con\ntent', # Test new line
+ owner='hive',
+ group='hadoop',
+ mode=0644,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-exec-log4j2.properties'),
+ content='con\ntent', # Test new line
+ owner='hive',
+ group='hadoop',
+ mode=0644,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'beeline-log4j2.properties'),
+ content='con\ntent', # Test new line
+ owner='hive',
+ group='hadoop',
+ mode=0644,
+ )
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-hiveserver2.properties'),
+ content=Template("hadoop-metrics2-hiveserver2.properties.j2"),
+ owner='hive',
+ group='hadoop',
+ mode = 0644,
+ )
+
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llapdaemon.properties'),
+ content=Template("hadoop-metrics2-llapdaemon.j2"),
+ owner='hive',
+ group='hadoop',
+ mode = 0644
+ )
+
+ self.assertResourceCalled('File', os.path.join(conf_dir, 'hadoop-metrics2-llaptaskscheduler.properties'),
+ content=Template("hadoop-metrics2-llaptaskscheduler.j2"),
+ owner='hive',
+ group='hadoop',
+ mode = 0644
+ )
pass
self.assertResourceCalled('Directory', '/etc/security/limits.d',
@@ -963,4 +1039,4 @@ class TestHiveServerInteractive(RMFTestCase):
mock_get_llap_app_status_data.return_value = llap_app_json
status = self.hsi.check_llap_app_status(self.llap_app_name, 2)
- self.assertEqual(status, False)
\ No newline at end of file
+ self.assertEqual(status, False)