You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/11/08 10:47:37 UTC
[2/2] ambari git commit: AMBARI-8227. Fix hive service check for
Beeline. (mahadev)
AMBARI-8227. Fix hive service check for Beeline. (mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f99b49c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f99b49c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f99b49c8
Branch: refs/heads/branch-1.7.0
Commit: f99b49c8251e9c5fed0210f3daab43b09dcbe28f
Parents: d5d5dd9
Author: Mahadev Konar <ma...@apache.org>
Authored: Sat Nov 8 01:47:23 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Sat Nov 8 01:47:23 2014 -0800
----------------------------------------------------------------------
.../libraries/functions/hive_check.py | 2 +-
.../HIVE/package/scripts/hive_service.py | 31 -------------------
.../HIVE/package/scripts/hive_service.py | 32 --------------------
.../stacks/1.3.2/HIVE/test_hive_server.py | 9 ------
.../1.3.2/HIVE/test_hive_service_check.py | 4 +--
.../stacks/2.0.6/HIVE/test_hive_server.py | 5 ---
.../2.0.6/HIVE/test_hive_service_check.py | 2 +-
7 files changed, 4 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
index 77a36e6..9e6087f 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
@@ -26,7 +26,7 @@ def check_thrift_port_sasl(address, port, hive_auth = "NOSASL", key = None, kini
"""
Hive thrift SASL port check
"""
- BEELINE_CHECK_TIMEOUT = 7
+ BEELINE_CHECK_TIMEOUT = 30
if kinitcmd:
url = format("jdbc:hive2://{address}:{port}/;principal={key}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
index 33bfd79..09f49c0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive_service.py
@@ -57,38 +57,7 @@ def hive_service(
Execute(db_connection_check_command,
path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin', tries=5, try_sleep=10)
- # AMBARI-5800 - wait for the server to come up instead of just the PID existance
- if name == 'hiveserver2':
- SOCKET_WAIT_SECONDS = 120
- address=params.hive_server_host
- port=int(params.hive_server_port)
-
- start_time = time.time()
- end_time = start_time + SOCKET_WAIT_SECONDS
-
- is_service_socket_valid = False
- print "Waiting for the Hive server to start..."
- if params.security_enabled:
- kinitcmd=format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser}; ")
- else:
- kinitcmd=None
-
- while time.time() < end_time:
- try:
- check_thrift_port_sasl(address, port, params.hive_server2_authentication,
- params.hive_server_principal, kinitcmd)
- is_service_socket_valid = True
- break
- except:
- time.sleep(2)
- elapsed_time = time.time() - start_time
-
- if is_service_socket_valid == False:
- raise Fail("Connection to Hive server %s on port %s failed after %d seconds" % (address, port, elapsed_time))
-
- print "Successfully connected to Hive at %s on port %s after %d seconds" % (address, port, elapsed_time)
-
elif action == 'stop':
demon_cmd = format("kill `cat {pid_file}` >/dev/null 2>&1 && rm -f {pid_file}")
Execute(demon_cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
index 54de40a..7a26beb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive_service.py
@@ -62,39 +62,7 @@ def hive_service(
Execute(db_connection_check_command,
path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin', tries=5, try_sleep=10)
-
- # AMBARI-5800 - wait for the server to come up instead of just the PID existance
- if name == 'hiveserver2':
- SOCKET_WAIT_SECONDS = 120
- address=params.hive_server_host
- port=int(params.hive_server_port)
-
- start_time = time.time()
- end_time = start_time + SOCKET_WAIT_SECONDS
-
- is_service_socket_valid = False
- print "Waiting for the Hive server to start..."
- if params.security_enabled:
- kinitcmd=format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser}; ")
- else:
- kinitcmd=None
- while time.time() < end_time:
- try:
- check_thrift_port_sasl(address, port, params.hive_server2_authentication,
- params.hive_server_principal, kinitcmd)
- is_service_socket_valid = True
- break
- except:
- time.sleep(2)
-
- elapsed_time = time.time() - start_time
-
- if is_service_socket_valid == False:
- raise Fail("Connection to Hive server %s on port %s failed after %d seconds" % (address, port, elapsed_time))
-
- print "Successfully connected to Hive at %s on port %s after %d seconds" % (address, port, elapsed_time)
-
elif action == 'stop':
demon_cmd = format("kill `cat {pid_file}` >/dev/null 2>&1 && rm -f {pid_file}")
Execute(demon_cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
index e49bdba..d06088a 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
@@ -80,10 +80,6 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
- self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000' -e '' 2>&1| awk '{print}'|grep Error",
- path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
- timeout = 7,
- )
self.assertNoMoreResources()
@@ -158,11 +154,6 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
- self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ',)
- self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep Error",
- path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
- timeout = 7,
- )
self.assertNoMoreResources()
@patch("socket.socket")
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
index 2934ee9..f0c2179 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py
@@ -35,7 +35,7 @@ class TestServiceCheck(RMFTestCase):
)
self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000' -e '' 2>&1| awk '{print}'|grep Error",
path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
- timeout = 7,
+ timeout = 30,
)
self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
content = StaticFile('hcatSmoke.sh'),
@@ -86,7 +86,7 @@ class TestServiceCheck(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ',)
self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep Error",
path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
- timeout = 7,
+ timeout = 30,
)
self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
content = StaticFile('hcatSmoke.sh'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/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 cf4f062..cb6f9ba 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
@@ -108,11 +108,6 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver',
path=['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries=5, try_sleep=10
)
- self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ',)
- self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep Error",
- path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
- timeout=7
- )
self.assertNoMoreResources()
self.assertTrue(check_fs_root_mock.called)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f99b49c8/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 99b0b33..3e82333 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
@@ -84,7 +84,7 @@ class TestServiceCheck(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ',)
self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep Error",
path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
- timeout= 7
+ timeout= 30,
)
self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
content = StaticFile('hcatSmoke.sh'),