Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 56cf13713 -> 5d0a4bdcd


AMBARI-13994. HiveServer2 Process critical alert is present (Upgrade from 2.1.1 
to 2.1.3.0).(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d0a4bdc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d0a4bdc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d0a4bdc

Branch: refs/heads/branch-2.1
Commit: 5d0a4bdcdf91e91dda3e8a9d86db1cfc210fcc17
Parents: 56cf137
Author: Vitaly Brodetskyi <[email protected]>
Authored: Fri Nov 20 13:27:52 2015 +0200
Committer: Vitaly Brodetskyi <[email protected]>
Committed: Fri Nov 20 13:27:52 2015 +0200

----------------------------------------------------------------------
 .../resource_management/libraries/functions/hive_check.py      | 2 +-
 .../test/python/stacks/2.0.6/HIVE/test_hive_service_check.py   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d0a4bdc/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 554b1dc..55fd6bd 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
@@ -61,7 +61,7 @@ def check_thrift_port_sasl(address, port, hive_auth="NOSASL", 
key=None, kinitcmd
     beeline_url.append('principal={key}')
     Execute(kinitcmd, user=smokeuser)
 
-  cmd = "! beeline -u '%s' -e '' 2>&1| awk '{print}'|grep -i -e 'Connection 
refused' -e 'Invalid URL' -e 'Error'" % \
+  cmd = "! beeline -u '%s' -e '' 2>&1| awk '{print}'|grep -i -e 'Connection 
refused' -e 'Invalid URL'" % \
         format(";".join(beeline_url))
   Execute(cmd,
           user=smokeuser,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d0a4bdc/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 90354b3..00439a8 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
@@ -41,7 +41,7 @@ class TestServiceCheck(RMFTestCase):
                         hdp_stack_version = self.STACK_VERSION,
                         target = RMFTestCase.TARGET_COMMON_SERVICES
     )
-    self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10000/;transportMode=binary;auth=noSasl' 
-e '' 2>&1| awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL' -e 
'Error'",
+    self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10000/;transportMode=binary;auth=noSasl' 
-e '' 2>&1| awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
                               path = ['/bin/', '/usr/bin/', 
'/usr/lib/hive/bin/', '/usr/sbin/'],
                               user = 'ambari-qa',
                               timeout = 30,
@@ -152,7 +152,7 @@ class TestServiceCheck(RMFTestCase):
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/smokeuser.headless.keytab [email protected]; ',
                               user = 'ambari-qa',
                               )
-    self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10000/;transportMode=binary;principal=hive/[email protected]'
 -e '' 2>&1| awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL' -e 
'Error'",
+    self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10000/;transportMode=binary;principal=hive/[email protected]'
 -e '' 2>&1| awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
                               path = ['/bin/', '/usr/bin/', 
'/usr/lib/hive/bin/', '/usr/sbin/'],
                               user = 'ambari-qa',
                               timeout = 30,
@@ -265,7 +265,7 @@ class TestServiceCheck(RMFTestCase):
       hdp_stack_version = self.STACK_VERSION,
       target = RMFTestCase.TARGET_COMMON_SERVICES)
 
-    self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary' -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL' -e 'Error'",
+    self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary' -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
       path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
       timeout = 30,
       user = 'ambari-qa')

Reply via email to