Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7B2E185D4 for ; Mon, 19 Oct 2015 13:53:58 +0000 (UTC) Received: (qmail 84831 invoked by uid 500); 19 Oct 2015 13:53:48 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 84766 invoked by uid 500); 19 Oct 2015 13:53:48 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 83611 invoked by uid 99); 19 Oct 2015 13:53:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Oct 2015 13:53:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0842DE04B0; Mon, 19 Oct 2015 13:53:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 19 Oct 2015 13:54:15 -0000 Message-Id: <73405faef24d4a028e880fc349499cdb@git.apache.org> In-Reply-To: <66fcf29c5f8941b4b1404eabf60a2911@git.apache.org> References: <66fcf29c5f8941b4b1404eabf60a2911@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] ambari git commit: AMBARI-13452. RegionServer Upgrade verification is not case sensitive (aonishuk) 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 Authored: Fri Oct 16 17:59:01 2015 +0300 Committer: Andrew Onishuk 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")