Repository: hbase Updated Branches: refs/heads/branch-1 52c51fc27 -> e4ee7ee89 refs/heads/branch-1.3 695920846 -> 65d1af571
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/e4ee7ee8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4ee7ee8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4ee7ee8 Branch: refs/heads/branch-1 Commit: e4ee7ee8916d0b561bc4df37a389352169c24c6e Parents: 52c51fc Author: Andrew Purtell <[email protected]> Authored: Wed Feb 8 16:04:47 2017 -0800 Committer: Andrew Purtell <[email protected]> Committed: Thu Feb 9 13:37:40 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/e4ee7ee8/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 b198d53..b3e40a3 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 @@ -2048,7 +2048,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; } });
