Repository: hbase Updated Branches: refs/heads/branch-1.3 cbfd15daa -> cdbda777f
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/cdbda777 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cdbda777 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cdbda777 Branch: refs/heads/branch-1.3 Commit: cdbda777f64a652139339b2024e0b7b1397f5f37 Parents: cbfd15d Author: tedyu <yuzhih...@gmail.com> Authored: Wed Oct 11 15:33:26 2017 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Wed Oct 11 15:33:26 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/cdbda777/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 4118b10..54a0b74 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 @@ -2381,7 +2381,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();
