hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-18890, Backport HBASE-14499 (Master coprocessors shutdown will not happen on master abort) to branch-1
Date Fri, 29 Sep 2017 23:21:30 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 8148a75cb -> 790d006cc


HBASE-18890, Backport HBASE-14499 (Master coprocessors shutdown will not happen on master
abort) to branch-1

Signed-off-by: tedyu <yuzhihong@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/790d006c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/790d006c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/790d006c

Branch: refs/heads/branch-1.4
Commit: 790d006cc29e62450bf489ec3177be7de2290ff7
Parents: 8148a75
Author: Pankaj Kumar <pankaj.kr@huawei.com>
Authored: Thu Sep 28 20:41:28 2017 +0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Fri Sep 29 16:21:20 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/790d006c/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 136c7d4..29307c9 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
@@ -2551,7 +2551,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


Mime
View raw message