You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/09/26 15:17:44 UTC
hbase git commit: HBASE-18874,
HMaster abort message will be skipped if Throwable is passed null
Repository: hbase
Updated Branches:
refs/heads/master 410368b84 -> 9e7b16b88
HBASE-18874, HMaster abort message will be skipped if Throwable is passed null
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9e7b16b8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9e7b16b8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9e7b16b8
Branch: refs/heads/master
Commit: 9e7b16b88ed6e9c2c3f53743bfe5c74098f2b8a4
Parents: 410368b
Author: Pankaj Kumar <pa...@huawei.com>
Authored: Tue Sep 26 20:01:06 2017 +0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Sep 26 08:17:34 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/9e7b16b8/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 cfb4300..e675d7e 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
@@ -2634,7 +2634,12 @@ public class HMaster extends HRegionServer implements MasterServices {
LOG.fatal("Master server abort: loaded coprocessors are: " +
getLoadedCoprocessors());
}
- if (t != null) LOG.fatal(msg, t);
+ if (t != null) {
+ LOG.fatal(msg, t);
+ } else {
+ LOG.fatal(msg);
+ }
+
try {
stopMaster();
} catch (IOException e) {