Repository: ambari Updated Branches: refs/heads/branch-2.1 4acd15106 -> 59cf4b76c
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/59cf4b76 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59cf4b76 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59cf4b76 Branch: refs/heads/branch-2.1 Commit: 59cf4b76c30df5a7cec25697d2258d712cb8fe13 Parents: 4acd151 Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Mon Nov 2 22:13:05 2015 -0800 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Mon Nov 2 22:21:48 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/59cf4b76/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/59cf4b76/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}`"),
