You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/07/06 17:37:53 UTC
hbase git commit: HBASE-13646 HRegion#execService should not try to
build incomplete messages
Repository: hbase
Updated Branches:
refs/heads/branch-1 4e3681590 -> 8d71d283b
HBASE-13646 HRegion#execService should not try to build incomplete messages
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8d71d283
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8d71d283
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8d71d283
Branch: refs/heads/branch-1
Commit: 8d71d283b92501baf9ba681c8cb63e234e4c2ece
Parents: 4e36815
Author: Andrey Stepachev <oc...@gmail.com>
Authored: Mon Jul 6 10:24:00 2015 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Jul 6 10:36:13 2015 -0500
----------------------------------------------------------------------
.../hbase/protobuf/ResponseConverter.java | 20 +++++
hbase-server/pom.xml | 1 +
.../hadoop/hbase/regionserver/HRegion.java | 10 ++-
.../hbase/regionserver/HRegionServer.java | 15 ++--
.../hbase/regionserver/RSRpcServices.java | 6 +-
.../coprocessor/TestCoprocessorEndpoint.java | 1 +
.../TestRegionServerCoprocessorEndpoint.java | 39 ++++++++--
.../DummyRegionServerEndpointProtos.java | 81 +++++++++++++++++++-
.../protobuf/DummyRegionServerEndpoint.proto | 1 +
9 files changed, 151 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
index 5752176..61bcd68 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hbase.protobuf;
+import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -328,6 +329,25 @@ public final class ResponseConverter {
}
/**
+ * Retreivies exception stored during RPC invocation.
+ * @param controller the controller instance provided by the client when calling the service
+ * @return exception if any, or null; Will return DoNotRetryIOException for string represented
+ * failure causes in controller.
+ */
+ @Nullable
+ public static IOException getControllerException(RpcController controller) throws IOException {
+ if (controller != null && controller.failed()) {
+ if (controller instanceof ServerRpcController) {
+ return ((ServerRpcController)controller).getFailedOn();
+ } else {
+ return new DoNotRetryIOException(controller.errorText());
+ }
+ }
+ return null;
+ }
+
+
+ /**
* Create Results from the cells using the cells meta data.
* @param cellScanner
* @param response
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index e752e6f..ebb807a 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -786,6 +786,7 @@
<include>ColumnAggregationProtocol.proto</include>
<include>IncrementCounterProcessor.proto</include>
<include>PingProtocol.proto</include>
+ <include>DummyRegionServerEndpoint.proto</include>
<include>test.proto</include>
<include>test_delayed_rpc.proto</include>
<include>test_rpc_service.proto</include>
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 6d4352e..8f3c58d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -127,6 +127,7 @@ import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.monitoring.TaskMonitor;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
+import org.apache.hadoop.hbase.protobuf.ResponseConverter;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall;
@@ -7408,8 +7409,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
*/
Descriptors.ServiceDescriptor serviceDesc = instance.getDescriptorForType();
if (coprocessorServiceHandlers.containsKey(serviceDesc.getFullName())) {
- LOG.error("Coprocessor service "+serviceDesc.getFullName()+
- " already registered, rejecting request from "+instance
+ LOG.error("Coprocessor service " + serviceDesc.getFullName() +
+ " already registered, rejecting request from " + instance
);
return false;
}
@@ -7465,6 +7466,11 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
coprocessorHost.postEndpointInvocation(service, methodName, request, responseBuilder);
}
+ IOException exception = ResponseConverter.getControllerException(controller);
+ if (exception != null) {
+ throw exception;
+ }
+
return responseBuilder.build();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index ad1bacb..54bcc45 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -107,6 +107,7 @@ import org.apache.hadoop.hbase.master.TableLockManager;
import org.apache.hadoop.hbase.procedure.RegionServerProcedureManagerHost;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.RequestConverter;
+import org.apache.hadoop.hbase.protobuf.ResponseConverter;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceRequest;
@@ -3213,10 +3214,11 @@ public class HRegionServer extends HasThread implements
return result;
}
- public CoprocessorServiceResponse execRegionServerService(final RpcController controller,
+ public CoprocessorServiceResponse execRegionServerService(
+ @SuppressWarnings("UnusedParameters") final RpcController controller,
final CoprocessorServiceRequest serviceRequest) throws ServiceException {
try {
- ServerRpcController execController = new ServerRpcController();
+ ServerRpcController serviceController = new ServerRpcController();
CoprocessorServiceCall call = serviceRequest.getCall();
String serviceName = call.getServiceName();
String methodName = call.getMethodName();
@@ -3236,7 +3238,7 @@ public class HRegionServer extends HasThread implements
.build();
final Message.Builder responseBuilder =
service.getResponsePrototype(methodDesc).newBuilderForType();
- service.callMethod(methodDesc, controller, request, new RpcCallback<Message>() {
+ service.callMethod(methodDesc, serviceController, request, new RpcCallback<Message>() {
@Override
public void run(Message message) {
if (message != null) {
@@ -3244,10 +3246,11 @@ public class HRegionServer extends HasThread implements
}
}
});
- Message execResult = responseBuilder.build();
- if (execController.getFailedOn() != null) {
- throw execController.getFailedOn();
+ IOException exception = ResponseConverter.getControllerException(serviceController);
+ if (exception != null) {
+ throw exception;
}
+ Message execResult = responseBuilder.build();
ClientProtos.CoprocessorServiceResponse.Builder builder =
ClientProtos.CoprocessorServiceResponse.newBuilder();
builder.setRegion(RequestConverter.buildRegionSpecifier(RegionSpecifierType.REGION_NAME,
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index d6724ba..69d2a89 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -1876,11 +1876,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
final ClientProtos.CoprocessorServiceCall serviceCall) throws IOException {
// ignore the passed in controller (from the serialized call)
ServerRpcController execController = new ServerRpcController();
- Message result = region.execService(execController, serviceCall);
- if (execController.getFailedOn() != null) {
- throw execController.getFailedOn();
- }
- return result;
+ return region.execService(execController, serviceCall);
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
index 166c7e8..f62b307 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
@@ -86,6 +86,7 @@ public class TestCoprocessorEndpoint {
public static void setupBeforeClass() throws Exception {
// set configure to indicate which cp should be loaded
Configuration conf = util.getConfiguration();
+ conf.setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 5000);
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
org.apache.hadoop.hbase.coprocessor.ColumnAggregationEndpoint.class.getName(),
ProtobufCoprocessorService.class.getName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
index ef75040..414e3e3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
@@ -18,7 +18,9 @@
package org.apache.hadoop.hbase.coprocessor;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
@@ -27,14 +29,15 @@ import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos;
import org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest;
import org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse;
import org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyService;
import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
+import org.apache.hadoop.hbase.ipc.RemoteWithExtrasException;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
+import org.apache.hadoop.hbase.protobuf.ResponseConverter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -45,15 +48,14 @@ import com.google.protobuf.Service;
@Category(MediumTests.class)
public class TestRegionServerCoprocessorEndpoint {
+ public static final FileNotFoundException WHAT_TO_THROW = new FileNotFoundException("/file.txt");
private static HBaseTestingUtility TEST_UTIL = null;
- private static Configuration CONF = null;
private static final String DUMMY_VALUE = "val";
@BeforeClass
public static void setupBeforeClass() throws Exception {
TEST_UTIL = new HBaseTestingUtility();
- CONF = TEST_UTIL.getConfiguration();
- CONF.setStrings(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY,
+ TEST_UTIL.getConfiguration().setStrings(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY,
DummyRegionServerEndpoint.class.getName());
TEST_UTIL.startMiniCluster();
}
@@ -71,15 +73,32 @@ public class TestRegionServerCoprocessorEndpoint {
new BlockingRpcCallback<DummyRegionServerEndpointProtos.DummyResponse>();
DummyRegionServerEndpointProtos.DummyService service =
ProtobufUtil.newServiceStub(DummyRegionServerEndpointProtos.DummyService.class,
- new HBaseAdmin(CONF).coprocessorService(serverName));
+ TEST_UTIL.getHBaseAdmin().coprocessorService(serverName));
service.dummyCall(controller,
- DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance(), rpcCallback);
+ DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance(), rpcCallback);
assertEquals(DUMMY_VALUE, rpcCallback.get().getValue());
if (controller.failedOnException()) {
throw controller.getFailedOn();
}
}
+ @Test
+ public void testEndpointExceptions() throws Exception {
+ final ServerName serverName = TEST_UTIL.getHBaseCluster().getRegionServer(0).getServerName();
+ final ServerRpcController controller = new ServerRpcController();
+ final BlockingRpcCallback<DummyRegionServerEndpointProtos.DummyResponse> rpcCallback =
+ new BlockingRpcCallback<DummyRegionServerEndpointProtos.DummyResponse>();
+ DummyRegionServerEndpointProtos.DummyService service =
+ ProtobufUtil.newServiceStub(DummyRegionServerEndpointProtos.DummyService.class,
+ TEST_UTIL.getHBaseAdmin().coprocessorService(serverName));
+ service.dummyThrow(controller,
+ DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance(), rpcCallback);
+ assertEquals(null, rpcCallback.get());
+ assertTrue(controller.failedOnException());
+ assertEquals(WHAT_TO_THROW.getClass().getName().trim(),
+ ((RemoteWithExtrasException) controller.getFailedOn().getCause()).getClassName().trim());
+ }
+
static class DummyRegionServerEndpoint extends DummyService implements Coprocessor, SingletonCoprocessorService {
@Override
@@ -102,5 +121,13 @@ public class TestRegionServerCoprocessorEndpoint {
RpcCallback<DummyResponse> callback) {
callback.run(DummyResponse.newBuilder().setValue(DUMMY_VALUE).build());
}
+
+ @Override
+ public void dummyThrow(RpcController controller,
+ DummyRequest request,
+ RpcCallback<DummyResponse> done) {
+ ResponseConverter.setControllerException(controller, WHAT_TO_THROW);
+
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/protobuf/generated/DummyRegionServerEndpointProtos.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/protobuf/generated/DummyRegionServerEndpointProtos.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/protobuf/generated/DummyRegionServerEndpointProtos.java
index 050050b..12ce551 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/protobuf/generated/DummyRegionServerEndpointProtos.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/protobuf/generated/DummyRegionServerEndpointProtos.java
@@ -879,6 +879,14 @@ public final class DummyRegionServerEndpointProtos {
org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request,
com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse> done);
+ /**
+ * <code>rpc dummyThrow(.DummyRequest) returns (.DummyResponse);</code>
+ */
+ public abstract void dummyThrow(
+ com.google.protobuf.RpcController controller,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request,
+ com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse> done);
+
}
public static com.google.protobuf.Service newReflectiveService(
@@ -892,6 +900,14 @@ public final class DummyRegionServerEndpointProtos {
impl.dummyCall(controller, request, done);
}
+ @java.lang.Override
+ public void dummyThrow(
+ com.google.protobuf.RpcController controller,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request,
+ com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse> done) {
+ impl.dummyThrow(controller, request, done);
+ }
+
};
}
@@ -916,6 +932,8 @@ public final class DummyRegionServerEndpointProtos {
switch(method.getIndex()) {
case 0:
return impl.dummyCall(controller, (org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest)request);
+ case 1:
+ return impl.dummyThrow(controller, (org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest)request);
default:
throw new java.lang.AssertionError("Can't get here.");
}
@@ -932,6 +950,8 @@ public final class DummyRegionServerEndpointProtos {
switch(method.getIndex()) {
case 0:
return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance();
+ case 1:
+ return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance();
default:
throw new java.lang.AssertionError("Can't get here.");
}
@@ -948,6 +968,8 @@ public final class DummyRegionServerEndpointProtos {
switch(method.getIndex()) {
case 0:
return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance();
+ case 1:
+ return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance();
default:
throw new java.lang.AssertionError("Can't get here.");
}
@@ -964,6 +986,14 @@ public final class DummyRegionServerEndpointProtos {
org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request,
com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse> done);
+ /**
+ * <code>rpc dummyThrow(.DummyRequest) returns (.DummyResponse);</code>
+ */
+ public abstract void dummyThrow(
+ com.google.protobuf.RpcController controller,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request,
+ com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse> done);
+
public static final
com.google.protobuf.Descriptors.ServiceDescriptor
getDescriptor() {
@@ -991,6 +1021,11 @@ public final class DummyRegionServerEndpointProtos {
com.google.protobuf.RpcUtil.<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse>specializeCallback(
done));
return;
+ case 1:
+ this.dummyThrow(controller, (org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest)request,
+ com.google.protobuf.RpcUtil.<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse>specializeCallback(
+ done));
+ return;
default:
throw new java.lang.AssertionError("Can't get here.");
}
@@ -1007,6 +1042,8 @@ public final class DummyRegionServerEndpointProtos {
switch(method.getIndex()) {
case 0:
return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance();
+ case 1:
+ return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance();
default:
throw new java.lang.AssertionError("Can't get here.");
}
@@ -1023,6 +1060,8 @@ public final class DummyRegionServerEndpointProtos {
switch(method.getIndex()) {
case 0:
return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance();
+ case 1:
+ return org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance();
default:
throw new java.lang.AssertionError("Can't get here.");
}
@@ -1058,6 +1097,21 @@ public final class DummyRegionServerEndpointProtos {
org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.class,
org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance()));
}
+
+ public void dummyThrow(
+ com.google.protobuf.RpcController controller,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request,
+ com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse> done) {
+ channel.callMethod(
+ getDescriptor().getMethods().get(1),
+ controller,
+ request,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance(),
+ com.google.protobuf.RpcUtil.generalizeCallback(
+ done,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.class,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance()));
+ }
}
public static BlockingInterface newBlockingStub(
@@ -1070,6 +1124,11 @@ public final class DummyRegionServerEndpointProtos {
com.google.protobuf.RpcController controller,
org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request)
throws com.google.protobuf.ServiceException;
+
+ public org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse dummyThrow(
+ com.google.protobuf.RpcController controller,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request)
+ throws com.google.protobuf.ServiceException;
}
private static final class BlockingStub implements BlockingInterface {
@@ -1090,6 +1149,18 @@ public final class DummyRegionServerEndpointProtos {
org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance());
}
+
+ public org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse dummyThrow(
+ com.google.protobuf.RpcController controller,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyRequest request)
+ throws com.google.protobuf.ServiceException {
+ return (org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse) channel.callBlockingMethod(
+ getDescriptor().getMethods().get(1),
+ controller,
+ request,
+ org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.DummyResponse.getDefaultInstance());
+ }
+
}
// @@protoc_insertion_point(class_scope:DummyService)
@@ -1116,10 +1187,12 @@ public final class DummyRegionServerEndpointProtos {
java.lang.String[] descriptorData = {
"\n\037DummyRegionServerEndpoint.proto\"\016\n\014Dum" +
"myRequest\"\036\n\rDummyResponse\022\r\n\005value\030\001 \002(" +
- "\t2:\n\014DummyService\022*\n\tdummyCall\022\r.DummyRe" +
- "quest\032\016.DummyResponseB_\n6org.apache.hado" +
- "op.hbase.coprocessor.protobuf.generatedB" +
- "\037DummyRegionServerEndpointProtos\210\001\001\240\001\001"
+ "\t2g\n\014DummyService\022*\n\tdummyCall\022\r.DummyRe" +
+ "quest\032\016.DummyResponse\022+\n\ndummyThrow\022\r.Du" +
+ "mmyRequest\032\016.DummyResponseB_\n6org.apache" +
+ ".hadoop.hbase.coprocessor.protobuf.gener" +
+ "atedB\037DummyRegionServerEndpointProtos\210\001\001" +
+ "\240\001\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/8d71d283/hbase-server/src/test/protobuf/DummyRegionServerEndpoint.proto
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/protobuf/DummyRegionServerEndpoint.proto b/hbase-server/src/test/protobuf/DummyRegionServerEndpoint.proto
index 0beca9e..cc76825 100644
--- a/hbase-server/src/test/protobuf/DummyRegionServerEndpoint.proto
+++ b/hbase-server/src/test/protobuf/DummyRegionServerEndpoint.proto
@@ -30,4 +30,5 @@ message DummyResponse {
service DummyService {
rpc dummyCall(DummyRequest) returns(DummyResponse);
+ rpc dummyThrow(DummyRequest) returns(DummyResponse);
}