[2/2] ambari git commit: AMBARI-13452. RegionServer Upgrade verification is not case sensitive (aonishuk)

[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/66251218
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/66251218
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/66251218

Branch: refs/heads/branch-2.1
Commit: 66251218c7fcbcde3cbef781f5cfebeec8f8ba32
Parents: d1361f7
Author: Andrew Onishuk 
Authored: Fri Oct 16 16:01:12 2015 +0300
Committer: Andrew Onishuk 
Committed: Fri Oct 16 16:01:12 2015 +0300

--
 .../common-services/HBASE/0.96.0.2.0/package/scripts/upgrade.py   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/66251218/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 44bf958..a9ccede 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,8 +40,7 @@ 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.lower() + ":")
-
+  call_and_match(exec_cmd, params.hbase_user, params.hostname + ":")
 
 @retry(times=15, sleep_time=2, err_class=Fail)
 def call_and_match(cmd, user, regex):

[2/2] ambari git commit: AMBARI-13452. RegionServer Upgrade verification is not case sensitive (aonishuk)

[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/60ae0778
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60ae0778
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60ae0778

Branch: refs/heads/branch-2.1
Commit: 60ae0778c6e165a3b4ecc23f76f66c20893e3b59
Parents: ce74af8
Author: Andrew Onishuk 
Authored: Fri Oct 16 17:59:03 2015 +0300
Committer: Andrew Onishuk 
Committed: Fri Oct 16 17:59:03 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/60ae0778/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")