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

HBASE-14552 (addendum) Procedure V2: Reimplement DispatchMergingRegionHandler (add nonce support) (Stephen Yuan Jiang)

Browse Source
This commit is contained in:
Stephen Yuan Jiang 2016-07-19 08:49:23 -07:00
parent 9454daf25b
commit 638ca24f01
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
View File

@ -1614,7 +1614,7 @@ public class HBaseAdmin implements Admin {
} }
DispatchMergingRegionsResponse response = DispatchMergingRegionsResponse response =
executeCallable(new MasterCallable<DispatchMergingRegionsResponse>(getConnection()) { executeCallable(new MasterCallable<DispatchMergingRegionsResponse>(getConnection()) {
@Override @Override
public DispatchMergingRegionsResponse call(int callTimeout) throws ServiceException { public DispatchMergingRegionsResponse call(int callTimeout) throws ServiceException {
PayloadCarryingRpcController controller = rpcControllerFactory.newController(); PayloadCarryingRpcController controller = rpcControllerFactory.newController();
@ -1622,8 +1622,12 @@ public class HBaseAdmin implements Admin {
try { try {
DispatchMergingRegionsRequest request = RequestConverter DispatchMergingRegionsRequest request = RequestConverter
.buildDispatchMergingRegionsRequest(encodedNameOfRegionA, .buildDispatchMergingRegionsRequest(
encodedNameOfRegionB, forcible); encodedNameOfRegionA,
encodedNameOfRegionB,
forcible,
ng.getNonceGroup(),
ng.newNonce());
return master.dispatchMergingRegions(controller, request); return master.dispatchMergingRegions(controller, request);
} catch (DeserializationException de) { } catch (DeserializationException de) {
LOG.error("Could not parse destination server name: " + de); LOG.error("Could not parse destination server name: " + de);

9
hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
View File

@ -1103,14 +1103,19 @@ public final class RequestConverter {
} }
public static DispatchMergingRegionsRequest buildDispatchMergingRegionsRequest( public static DispatchMergingRegionsRequest buildDispatchMergingRegionsRequest(
final byte[] encodedNameOfRegionA, final byte[] encodedNameOfRegionB, final byte[] encodedNameOfRegionA,
final boolean forcible) throws DeserializationException { final byte[] encodedNameOfRegionB,
final boolean forcible,
final long nonceGroup,
final long nonce) throws DeserializationException {
DispatchMergingRegionsRequest.Builder builder = DispatchMergingRegionsRequest.newBuilder(); DispatchMergingRegionsRequest.Builder builder = DispatchMergingRegionsRequest.newBuilder();
builder.setRegionA(buildRegionSpecifier( builder.setRegionA(buildRegionSpecifier(
RegionSpecifierType.ENCODED_REGION_NAME, encodedNameOfRegionA)); RegionSpecifierType.ENCODED_REGION_NAME, encodedNameOfRegionA));
builder.setRegionB(buildRegionSpecifier( builder.setRegionB(buildRegionSpecifier(
RegionSpecifierType.ENCODED_REGION_NAME, encodedNameOfRegionB)); RegionSpecifierType.ENCODED_REGION_NAME, encodedNameOfRegionB));
builder.setForcible(forcible); builder.setForcible(forcible);
builder.setNonceGroup(nonceGroup);
builder.setNonce(nonce);
return builder.build(); return builder.build();
} }

8
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
View File

@ -1189,8 +1189,12 @@ public class TestAdmin1 {
// Try going to the master directly (that will skip the check in admin) // Try going to the master directly (that will skip the check in admin)
try { try {
DispatchMergingRegionsRequest request = RequestConverter DispatchMergingRegionsRequest request = RequestConverter
.buildDispatchMergingRegionsRequest(regions.get(1).getFirst().getEncodedNameAsBytes(), .buildDispatchMergingRegionsRequest(
regions.get(2).getFirst().getEncodedNameAsBytes(), true); regions.get(1).getFirst().getEncodedNameAsBytes(),
regions.get(2).getFirst().getEncodedNameAsBytes(),
true,
HConstants.NO_NONCE,
HConstants.NO_NONCE);
((ClusterConnection) TEST_UTIL.getAdmin().getConnection()).getMaster() ((ClusterConnection) TEST_UTIL.getAdmin().getConnection()).getMaster()
.dispatchMergingRegions(null, request); .dispatchMergingRegions(null, request);
} catch (ServiceException m) { } catch (ServiceException m) {