ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)
Date Tue, 03 Nov 2015 06:13:12 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8098e39de -> 14537c6f1


AMBARI-13683: Express Upgrade: HBASE upgrade fails during EU for HDP-2.1-> HDP-2.3 (jluniya)


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

Branch: refs/heads/trunk
Commit: 14537c6f16116c1cd7745d5dc8aa9a5798986722
Parents: 8098e39
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Mon Nov 2 22:13:05 2015 -0800
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Mon Nov 2 22:13:05 2015 -0800

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py         | 2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase_service.py              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/14537c6f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
index 30b71a3..ecab844 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_regionserver.py
@@ -75,7 +75,7 @@ class HbaseRegionServerDefault(HbaseRegionServer):
     env.set_params(params)
     upgrade.prestart(env, "hbase-regionserver")
 
-  def post_upgrade_restart(self, env):
+  def post_upgrade_restart(self, env, upgrade_type=None):
     import params
     env.set_params(params)
     upgrade.post_regionserver(env)

http://git-wip-us.apache.org/repos/asf/ambari/blob/14537c6f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index 427ed63..95cd49d 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
@@ -43,6 +43,7 @@ def hbase_service(
 
       Execute ( daemon_cmd,
         user = params.hbase_user,
+        only_if = no_op_test,
         # BUGFIX: hbase regionserver sometimes hangs when nn is in safemode
         timeout = 30,
         on_timeout = format("! ( {no_op_test} ) || {sudo} -H -E kill -9 `cat {pid_file}`"),


Mime
View raw message