ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-13126. RU: Webhcat restart failed on Debian 7 (aonishuk)
Date Tue, 22 Sep 2015 10:37:00 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 528be0a33 -> 82b2b960e


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/82b2b960
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82b2b960
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82b2b960

Branch: refs/heads/trunk
Commit: 82b2b960e4ae4b2de2cc39c38a9e62667b0c6020
Parents: 528be0a
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Sep 22 13:36:27 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Sep 22 13:36:27 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/82b2b960/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 48b5cbc..b597852 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.config['configurations']['hive-site'],
       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/82b2b960/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',


Mime
View raw message