[ambari] branch branch-2.7 updated: AMBARI-25359. Hive Service Check fails during Rolling Upgrade from HDP-3.1.0.0 to HDP-3.1.4.0 (aonishuk)

[ao...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 8573015  AMBARI-25359. Hive Service Check fails during Rolling Upgrade from HDP-3.1.0.0 to HDP-3.1.4.0 (aonishuk)
8573015 is described below

commit 85730159a4c7aab93b7801d215f76a06da9f5350
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Wed Aug 14 14:19:53 2019 +0300

    AMBARI-25359. Hive Service Check fails during Rolling Upgrade from HDP-3.1.0.0 to HDP-3.1.4.0 (aonishuk)
---
 .../main/python/resource_management/libraries/functions/hive_check.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 fa3eb7e..538bcfb 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
@@ -78,8 +78,8 @@ def check_thrift_port_sasl(address, port, hive_auth="NOSASL", key=None, kinitcmd
 
   # -n the user to connect as (ignored when using the hive principal in the URL, can be different from the user running the beeline command)
   # -e ';' executes a SQL commmand of NOOP
-  cmd = ("beeline -u '%s' %s -e ';' 2>&1 | awk '{print}' | grep -i " + \
-         "-e 'Connected to:' -e 'Transaction isolation:' -e 'inactive HS2 instance; use service discovery'") % \
+  cmd = ("! (beeline -u '%s' %s -e ';' 2>&1 | awk '{print}' | grep -vz -i " + \
+         "-e 'Connected to:' -e 'Transaction isolation:' -e 'inactive HS2 instance; use service discovery')") % \
         (format(";".join(beeline_url)), format(credential_str))
 
   Execute(cmd,