Revert "HBASE-17572 HMaster: Caught throwable while processing event C_M_MERGE_REGION (UndeclaredThrowableException)"
This reverts commit 054a0bd9be9e646971a5036ac9ca14bfc05f545e. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6effb0dc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6effb0dc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6effb0dc Branch: refs/heads/branch-1.3 Commit: 6effb0dcee4838c611da01d8e180aa571219bf0f Parents: 6431eab Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Feb 8 16:00:01 2017 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Wed Feb 8 16:00:01 2017 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/protobuf/ProtobufUtil.java | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6effb0dc/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 e83ec40..ac48ecd 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 @@ -1985,26 +1985,26 @@ public final class ProtobufUtil { final boolean forcible, final User user) throws IOException { final MergeRegionsRequest request = RequestConverter.buildMergeRegionsRequest( region_a.getRegionName(), region_b.getRegionName(),forcible); - try { - if (user != null) { - try { - user.getUGI().doAs(new PrivilegedExceptionAction<Void>() { - @Override - public Void run() throws Exception { - admin.mergeRegions(controller, request); - return null; - } - }); - } catch (InterruptedException ie) { - InterruptedIOException iioe = new InterruptedIOException(); - iioe.initCause(ie); - throw iioe; - } - } else { + if (user != null) { + try { + user.getUGI().doAs(new PrivilegedExceptionAction<Void>() { + @Override + public Void run() throws Exception { + admin.mergeRegions(controller, request); + return null; + } + }); + } catch (InterruptedException ie) { + InterruptedIOException iioe = new InterruptedIOException(); + iioe.initCause(ie); + throw iioe; + } + } else { + try { admin.mergeRegions(controller, request); + } catch (ServiceException se) { + throw ProtobufUtil.getRemoteException(se); } - } catch (ServiceException se) { - throw ProtobufUtil.getRemoteException(se); } }
