Repository: hbase Updated Branches: refs/heads/branch-1 c48155a4d -> 282842721
HBASE-18959 Backport HBASE-18874 (HMaster abort message will be skipped if Throwable is passed null) to branch-1 (Pankaj Kumar) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/28284272 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/28284272 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/28284272 Branch: refs/heads/branch-1 Commit: 2828427219015348c380a4380d1670e2c3d163e0 Parents: c48155a Author: tedyu <yuzhih...@gmail.com> Authored: Tue Oct 10 08:33:42 2017 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Tue Oct 10 08:33:42 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/28284272/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 29307c9..8a3bbd6 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 @@ -2550,7 +2550,11 @@ public class HMaster extends HRegionServer implements MasterServices, Server { 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();