You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/09/20 18:08:05 UTC
[2/2] ambari git commit: AMBARI-13126. RU: Webhcat restart failed on
Debian 7 (aonishuk)
AMBARI-13126. RU: Webhcat restart failed on Debian 7 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3e98f260
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3e98f260
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3e98f260
Branch: refs/heads/branch-2.1.2
Commit: 3e98f260340ec45cd339dbac29ba769c91cd9ebb
Parents: 70f2586
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sun Sep 20 19:07:16 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sun Sep 20 19:07:16 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 8 ++++--
.../stacks/2.0.6/HIVE/test_webhcat_server.py | 27 ++++++++++++--------
2 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e98f260/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index e3cb97b..aa43ede 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -95,13 +95,17 @@ def webhcat():
conf_dir = format("/usr/hdp/{version}/hive/conf"),
configurations = params.hive_site_config,
configuration_attributes = params.config['configuration_attributes']['hive-site'],
- owner = params.hive_user)
+ owner = params.hive_user,
+ group = params.user_group,
+ )
XmlConfig("yarn-site.xml",
conf_dir = format("/usr/hdp/{version}/hadoop/conf"),
configurations = params.config['configurations']['yarn-site'],
configuration_attributes = params.config['configuration_attributes']['yarn-site'],
- owner = params.yarn_user)
+ owner = params.yarn_user,
+ group = params.user_group,
+ )
File(format("{config_dir}/webhcat-env.sh"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/3e98f260/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index 469f6a2..aca7664 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -451,17 +451,24 @@ class TestWebHCatServer(RMFTestCase):
configuration_attributes = self.getConfig()['configuration_attributes']['webhcat-site'])
self.assertResourceCalled('XmlConfig', 'hive-site.xml',
- owner = 'hive',
- conf_dir = '/usr/hdp/2.3.0.0-1234/hive/conf',
- configurations = self.getConfig()['configurations']['hive-site'],
- configuration_attributes = self.getConfig()['configuration_attributes']['hive-site'])
-
+ owner = 'hive',
+ group = 'hadoop',
+ conf_dir = '/usr/hdp/2.3.0.0-1234/hive/conf',
+ 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'}},
+ configurations = self.getConfig()['configurations']['hive-site'],
+ )
self.assertResourceCalled('XmlConfig', 'yarn-site.xml',
- owner = 'yarn',
- conf_dir = '/usr/hdp/2.3.0.0-1234/hadoop/conf',
- configurations = self.getConfig()['configurations']['yarn-site'],
- configuration_attributes = self.getConfig()['configuration_attributes']['yarn-site'])
-
+ owner = 'yarn',
+ group = 'hadoop',
+ conf_dir = '/usr/hdp/2.3.0.0-1234/hadoop/conf',
+ configuration_attributes = {u'final': {u'yarn.nodemanager.container-executor.class': u'true',
+ u'yarn.nodemanager.disk-health-checker.min-healthy-disks': u'true',
+ u'yarn.nodemanager.local-dirs': u'true'}},
+ configurations = self.getConfig()['configurations']['yarn-site'],
+ )
+
self.assertResourceCalled('File', '/usr/hdp/current/hive-webhcat/etc/webhcat/webhcat-env.sh',
content = InlineTemplate(self.getConfig()['configurations']['webhcat-env']['content']),
owner = 'hcat',