Repository: hbase Updated Branches: refs/heads/branch-1.3 8e5f5dd65 -> f90e2f546
HBASE-18890, Backport HBASE-14499 (Master coprocessors shutdown will not happen on master abort) to branch-1 Signed-off-by: tedyu <yuzhih...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f90e2f54 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f90e2f54 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f90e2f54 Branch: refs/heads/branch-1.3 Commit: f90e2f546214dde0147d692f9dabb119c3dbdc17 Parents: 8e5f5dd Author: Pankaj Kumar <pankaj...@huawei.com> Authored: Thu Sep 28 20:41:28 2017 +0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Tue Oct 3 10:55:35 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f90e2f54/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 3df5342..4118b10 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -2382,7 +2382,12 @@ public class HMaster extends HRegionServer implements MasterServices, Server { getLoadedCoprocessors()); } if (t != null) LOG.fatal(msg, t); - stop(msg); + + try { + stopMaster(); + } catch (IOException e) { + LOG.error("Exception occurred while stopping master", e); + } } @Override