You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2021/05/17 07:39:42 UTC
[hadoop] branch branch-2.10 updated: HDFS-15912. Allow
ProtobufRpcEngine to be extensible (#2999)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 7f6185b HDFS-15912. Allow ProtobufRpcEngine to be extensible (#2999)
7f6185b is described below
commit 7f6185b17c5b71472ba6e6ba7580f0749d23da23
Author: hchaverri <55...@users.noreply.github.com>
AuthorDate: Mon May 17 00:37:07 2021 -0700
HDFS-15912. Allow ProtobufRpcEngine to be extensible (#2999)
---
.../org/apache/hadoop/ipc/ProtobufRpcEngine.java | 30 +++++++++++++++++-----
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
index af6d402..fa47aba 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
@@ -115,7 +115,7 @@ public class ProtobufRpcEngine implements RpcEngine {
factory)), false);
}
- private static class Invoker implements RpcInvocationHandler {
+ protected static class Invoker implements RpcInvocationHandler {
private final Map<String, Message> returnTypes =
new ConcurrentHashMap<String, Message>();
private boolean isClosed = false;
@@ -126,7 +126,7 @@ public class ProtobufRpcEngine implements RpcEngine {
private AtomicBoolean fallbackToSimpleAuth;
private AlignmentContext alignmentContext;
- private Invoker(Class<?> protocol, InetSocketAddress addr,
+ protected Invoker(Class<?> protocol, InetSocketAddress addr,
UserGroupInformation ticket, Configuration conf, SocketFactory factory,
int rpcTimeout, RetryPolicy connectionRetryPolicy,
AtomicBoolean fallbackToSimpleAuth, AlignmentContext alignmentContext)
@@ -141,7 +141,7 @@ public class ProtobufRpcEngine implements RpcEngine {
/**
* This constructor takes a connectionId, instead of creating a new one.
*/
- private Invoker(Class<?> protocol, Client.ConnectionId connId,
+ protected Invoker(Class<?> protocol, Client.ConnectionId connId,
Configuration conf, SocketFactory factory) {
this.remoteId = connId;
this.client = CLIENTS.getClient(conf, factory, RpcWritable.Buffer.class);
@@ -217,8 +217,6 @@ public class ProtobufRpcEngine implements RpcEngine {
traceScope = tracer.newScope(RpcClientUtil.methodToTraceString(method));
}
- RequestHeaderProto rpcRequestHeader = constructRpcRequestHeader(method);
-
if (LOG.isTraceEnabled()) {
LOG.trace(Thread.currentThread().getId() + ": Call -> " +
remoteId + ": " + method.getName() +
@@ -230,7 +228,7 @@ public class ProtobufRpcEngine implements RpcEngine {
final RpcWritable.Buffer val;
try {
val = (RpcWritable.Buffer) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER,
- new RpcProtobufRequest(rpcRequestHeader, theRequest), remoteId,
+ constructRpcRequest(method, theRequest), remoteId,
fallbackToSimpleAuth, alignmentContext);
} catch (Throwable e) {
@@ -275,6 +273,11 @@ public class ProtobufRpcEngine implements RpcEngine {
}
}
+ protected Writable constructRpcRequest(Method method, Message theRequest) {
+ RequestHeaderProto rpcRequestHeader = constructRpcRequestHeader(method);
+ return new RpcProtobufRequest(rpcRequestHeader, theRequest);
+ }
+
private Message getReturnMessage(final Method method,
final RpcWritable.Buffer buf) throws ServiceException {
Message prototype = null;
@@ -324,6 +327,14 @@ public class ProtobufRpcEngine implements RpcEngine {
public ConnectionId getConnectionId() {
return remoteId;
}
+
+ protected long getClientProtocolVersion() {
+ return clientProtocolVersion;
+ }
+
+ protected String getProtocolName() {
+ return protocolName;
+ }
}
@VisibleForTesting
@@ -484,6 +495,13 @@ public class ProtobufRpcEngine implements RpcEngine {
String methodName = rpcRequest.getMethodName();
String protoName = rpcRequest.getDeclaringClassProtocolName();
long clientVersion = rpcRequest.getClientProtocolVersion();
+ return call(server, protocol, request, receiveTime,
+ methodName, protoName, clientVersion);
+ }
+
+ protected Writable call(RPC.Server server, String protocol,
+ RpcWritable.Buffer request, long receiveTime, String methodName,
+ String protoName, long clientVersion) throws Exception {
if (server.verbose)
LOG.info("Call: protocol=" + protocol + ", method=" + methodName);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org