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-18874, HMaster abort message will be skipped if Throwable is passed null
Date Tue, 26 Sep 2017 15:18:07 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 2fee18815 -> 6d0eb0eef


HBASE-18874, HMaster abort message will be skipped if Throwable is passed null

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/6d0eb0ee
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6d0eb0ee
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6d0eb0ee

Branch: refs/heads/branch-2
Commit: 6d0eb0eef019a524e5226df6f8a4bee69908ea3c
Parents: 2fee188
Author: Pankaj Kumar <pankaj.kr@huawei.com>
Authored: Tue Sep 26 20:01:06 2017 +0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Sep 26 08:17:58 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/6d0eb0ee/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) {


Mime
View raw message