HBASE-17572 HMaster: Caught throwable while processing event C_M_MERGE_REGION
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/65d1af57 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65d1af57 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65d1af57 Branch: refs/heads/branch-1.3 Commit: 65d1af5711302d4ba37025c8891e5a9524619400 Parents: 6959208 Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Feb 8 16:04:47 2017 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Thu Feb 9 13:37:42 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/65d1af57/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java index ac48ecd..5a78601 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java @@ -1990,7 +1990,11 @@ public final class ProtobufUtil { user.getUGI().doAs(new PrivilegedExceptionAction<Void>() { @Override public Void run() throws Exception { - admin.mergeRegions(controller, request); + try { + admin.mergeRegions(controller, request); + } catch (ServiceException se) { + throw ProtobufUtil.getRemoteException(se); + } return null; } });
