You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/09/22 16:12:03 UTC
git commit: AMBARI-7432 Sqoop service check fails for HDP2.2 (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 201b7e958 -> f4ddfd65b
AMBARI-7432 Sqoop service check fails for HDP2.2 (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4ddfd65
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4ddfd65
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4ddfd65
Branch: refs/heads/trunk
Commit: f4ddfd65b9f070f23fb9489ad09e893bd5257be8
Parents: 201b7e9
Author: Dmytro Sen <ds...@hortonworks.com>
Authored: Mon Sep 22 17:03:05 2014 +0300
Committer: Dmytro Sen <ds...@hortonworks.com>
Committed: Mon Sep 22 17:03:05 2014 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py | 2 ++
.../HDP/2.0.6/services/SQOOP/package/scripts/service_check.py | 1 +
.../src/test/python/stacks/2.0.6/SQOOP/test_service_check.py | 2 ++
3 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4ddfd65/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py
index e97bb9f..ff200b8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py
@@ -30,11 +30,13 @@ if rpm_version is not None:
sqoop_lib = '/usr/hdp/current/sqoop/lib'
hbase_home = '/usr/hdp/current/hbase'
hive_home = '/usr/hdp/current/hive'
+ sqoop_bin_dir = '/usr/hdp/current/sqoop/bin/'
else:
sqoop_conf_dir = "/usr/lib/sqoop/conf"
sqoop_lib = "/usr/lib/sqoop/lib"
hbase_home = "/usr"
hive_home = "/usr"
+ sqoop_bin_dir = "/usr/bin"
zoo_conf_dir = "/etc/zookeeper"
security_enabled = config['configurations']['cluster-env']['security_enabled']
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4ddfd65/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/service_check.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/service_check.py
index c42501a..98edc1c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/service_check.py
@@ -30,6 +30,7 @@ class SqoopServiceCheck(Script):
Execute(format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser}"))
Execute("sqoop version",
user = params.smokeuser,
+ path = params.sqoop_bin_dir,
logoutput = True
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4ddfd65/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
index fa87bc6..21f9663 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
@@ -31,6 +31,7 @@ class TestSqoopServiceCheck(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa',)
self.assertResourceCalled('Execute', 'sqoop version',
logoutput = True,
+ path = ['/usr/bin'],
user = 'ambari-qa',)
self.assertNoMoreResources()
@@ -42,6 +43,7 @@ class TestSqoopServiceCheck(RMFTestCase):
)
self.assertResourceCalled('Execute', 'sqoop version',
logoutput = True,
+ path = ['/usr/bin'],
user = 'ambari-qa',)
self.assertNoMoreResources()