Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-17572 HMaster: Caught throwable while processing event C_M_MERGE_REGION (UndeclaredThrowableException)" 

This reverts commit fb1239766d.
This commit is contained in:
Andrew Purtell 2017-02-08 15:59:44 -08:00
parent 8f6388503b
commit fd062011f0
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
View File

@ -2043,7 +2043,6 @@ public final class ProtobufUtil {
final boolean forcible, final User user) throws IOException { final boolean forcible, final User user) throws IOException {
final MergeRegionsRequest request = RequestConverter.buildMergeRegionsRequest( final MergeRegionsRequest request = RequestConverter.buildMergeRegionsRequest(
region_a.getRegionName(), region_b.getRegionName(),forcible); region_a.getRegionName(), region_b.getRegionName(),forcible);
try {
if (user != null) { if (user != null) {
try { try {
user.getUGI().doAs(new PrivilegedExceptionAction<Void>() { user.getUGI().doAs(new PrivilegedExceptionAction<Void>() {
@ -2059,12 +2058,13 @@ public final class ProtobufUtil {
throw iioe; throw iioe;
} }
} else { } else {
try {
admin.mergeRegions(controller, request); admin.mergeRegions(controller, request);
}
} catch (ServiceException se) { } catch (ServiceException se) {
throw ProtobufUtil.getRemoteException(se); throw ProtobufUtil.getRemoteException(se);
} }
} }
}
// End helpers for Admin // End helpers for Admin