AMBARI-13452. RegionServer Upgrade verification is not case sensitive (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e89a0036 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e89a0036 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e89a0036 Branch: refs/heads/branch-dev-patch-upgrade Commit: e89a0036a4155e40ee53c3efa6b77defcbd2aece Parents: e3958e2 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Fri Oct 16 17:59:01 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Fri Oct 16 17:59:01 2015 +0300 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/scripts/upgrade.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e89a0036/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py index a9ccede..00040fa 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py @@ -40,12 +40,12 @@ def post_regionserver(env): check_cmd = "echo 'status \"simple\"' | {0} shell".format(params.hbase_cmd) exec_cmd = "{0} {1}".format(params.kinit_cmd, check_cmd) - call_and_match(exec_cmd, params.hbase_user, params.hostname + ":") + call_and_match(exec_cmd, params.hbase_user, params.hostname + ":", re.IGNORECASE) @retry(times=15, sleep_time=2, err_class=Fail) -def call_and_match(cmd, user, regex): +def call_and_match(cmd, user, regex, regex_search_flags): code, out = shell.call(cmd, user=user) - if not (out and re.search(regex, out)): + if not (out and re.search(regex, out, regex_search_flags)): raise Fail("Could not verify RS available")
