You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/02/04 15:07:37 UTC
git commit: AMBARI-4505. HCat,
Tez client install fails. Additional changes. (Eugene Chekanskiy via
dlysnichenko)
Updated Branches:
refs/heads/trunk a1c5645d9 -> 7057e558e
AMBARI-4505. HCat, Tez client install fails. Additional changes. (Eugene Chekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7057e558
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7057e558
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7057e558
Branch: refs/heads/trunk
Commit: 7057e558e2ce1f5863f68e5cfff0f522099e1400
Parents: a1c5645
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Feb 4 16:06:13 2014 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Feb 4 16:06:13 2014 +0200
----------------------------------------------------------------------
.../HDP/2.0.6/hooks/before-INSTALL/scripts/params.py | 2 +-
.../stacks/HDP/2.0.6/services/HIVE/package/files/hcat | 13 -------------
.../HDP/2.0.6/services/HIVE/package/scripts/hcat.py | 5 -----
.../HIVE/package/scripts/hcat_service_check.py | 2 +-
.../HDP/2.1.1/services/TEZ/package/scripts/params.py | 2 +-
.../test/python/stacks/2.0.6/HIVE/test_hcat_client.py | 8 --------
.../stacks/2.0.6/HIVE/test_hive_service_check.py | 4 ++--
7 files changed, 5 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
index bdd598e..5fdfd50 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
@@ -38,7 +38,7 @@ zk_user = config['configurations']['global']['zk_user']
gmetad_user = config['configurations']['global']["gmetad_user"]
gmond_user = config['configurations']['global']["gmond_user"]
storm_user = config['configurations']['global']['storm_user']
-tez_user = default('/configurations/global/tez_user', 'tez')
+tez_user = 'tez'
user_group = config['configurations']['global']['user_group']
proxyuser_group = config['configurations']['global']['proxyuser_group']
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/files/hcat
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/files/hcat b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/files/hcat
deleted file mode 100644
index e579a1c..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/files/hcat
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-. /etc/default/hadoop
-
-# Instead of bigtop-detect-javahome
-. /etc/hive-hcatalog/conf/hcat-env.sh
-
-# FIXME: HCATALOG-636 (and also HIVE-2757)
-export HIVE_HOME=/usr/lib/hive
-export HIVE_CONF_DIR=/etc/hive/conf
-export HCAT_HOME=/usr/lib/hive-hcatalog
-
-export HCATALOG_HOME=/usr/lib/hive-hcatalog
-exec /usr/lib/hive-hcatalog/bin/hcat "$@"
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py
index 56c3110..2993d3a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py
@@ -35,11 +35,6 @@ def hcat():
recursive=True
)
- File("/usr/bin/hcat",
- mode=0755,
- content=StaticFile('hcat')
- )
-
hcat_TemplateConfig('hcat-env.sh')
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
index bc75e44..36680ee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat_service_check.py
@@ -38,7 +38,7 @@ def hcat_service_check():
mode=0755
)
- prepare_cmd = format("{kinit_cmd}sh /tmp/hcatSmoke.sh hcatsmoke{unique} prepare")
+ prepare_cmd = format("{kinit_cmd}env JAVA_HOME={java64_home} sh /tmp/hcatSmoke.sh hcatsmoke{unique} prepare")
Execute(prepare_cmd,
tries=3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
index 316c777..203fc66 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/TEZ/package/scripts/params.py
@@ -30,5 +30,5 @@ log_dir = default('/configurations/global/tez_log_dir', '/var/log/hadoop-tez/')
hadoop_home = '/usr'
java64_home = config['hostLevelParams']['java_home']
-tez_user = default('/configurations/global/tez_user', 'tez')
+tez_user = 'tez'
user_group = config['configurations']['global']['user_group']
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py
index ec6d92d..0ae1f6f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py
@@ -37,10 +37,6 @@ class TestHcatClient(RMFTestCase):
owner = 'hcat',
recursive = True,
)
- self.assertResourceCalled('File',"/usr/bin/hcat",
- mode=0755,
- content=StaticFile('hcat')
- )
self.assertResourceCalled('TemplateConfig', '/etc/hcatalog/conf/hcat-env.sh',
owner = 'hcat',
group = 'hadoop',
@@ -64,10 +60,6 @@ class TestHcatClient(RMFTestCase):
owner = 'hcat',
recursive = True,
)
- self.assertResourceCalled('File',"/usr/bin/hcat",
- mode=0755,
- content=StaticFile('hcat')
- )
self.assertResourceCalled('TemplateConfig', '/etc/hcatalog/conf/hcat-env.sh',
owner = 'hcat',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/7057e558/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 7023a28..ee89fdb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -49,7 +49,7 @@ class TestServiceCheck(RMFTestCase):
content = StaticFile('hcatSmoke.sh'),
mode = 493,
)
- self.assertResourceCalled('Execute', 'sh /tmp/hcatSmoke.sh hcatsmoke prepare',
+ self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 sh /tmp/hcatSmoke.sh hcatsmoke prepare',
logoutput = True,
path = ['/usr/sbin', '/usr/local/nin', '/bin', '/usr/bin'],
tries = 3,
@@ -95,7 +95,7 @@ class TestServiceCheck(RMFTestCase):
content = StaticFile('hcatSmoke.sh'),
mode = 493,
)
- self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; sh /tmp/hcatSmoke.sh hcatsmoke prepare',
+ self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 sh /tmp/hcatSmoke.sh hcatsmoke prepare',
logoutput = True,
path = ['/usr/sbin', '/usr/local/nin', '/bin', '/usr/bin'],
tries = 3,