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

HADOOP-17680. Allow ProtobufRpcEngine to be extensible (#2905) Contributed by Hector Chaverri. 

(cherry picked from commit f40e3eb059)
This commit is contained in:
hchaverr 2021-05-06 16:40:45 -07:00 committed by Konstantin V Shvachko
parent a5bb211a2b
commit f6af5bff9e
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
View File

@ -115,7 +115,7 @@ public class ProtobufRpcEngine implements RpcEngine {
factory)), false); factory)), false);
} }
private static class Invoker implements RpcInvocationHandler { protected static class Invoker implements RpcInvocationHandler {
private final Map<String, Message> returnTypes = private final Map<String, Message> returnTypes =
new ConcurrentHashMap<String, Message>(); new ConcurrentHashMap<String, Message>();
private boolean isClosed = false; private boolean isClosed = false;
@ -126,7 +126,7 @@ public class ProtobufRpcEngine implements RpcEngine {
private AtomicBoolean fallbackToSimpleAuth; private AtomicBoolean fallbackToSimpleAuth;
private AlignmentContext alignmentContext; private AlignmentContext alignmentContext;
private Invoker(Class<?> protocol, InetSocketAddress addr, protected Invoker(Class<?> protocol, InetSocketAddress addr,
UserGroupInformation ticket, Configuration conf, SocketFactory factory, UserGroupInformation ticket, Configuration conf, SocketFactory factory,
int rpcTimeout, RetryPolicy connectionRetryPolicy, int rpcTimeout, RetryPolicy connectionRetryPolicy,
AtomicBoolean fallbackToSimpleAuth, AlignmentContext alignmentContext) AtomicBoolean fallbackToSimpleAuth, AlignmentContext alignmentContext)
@ -141,7 +141,7 @@ public class ProtobufRpcEngine implements RpcEngine {
/** /**
* This constructor takes a connectionId, instead of creating a new one. * 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) { Configuration conf, SocketFactory factory) {
this.remoteId = connId; this.remoteId = connId;
this.client = CLIENTS.getClient(conf, factory, RpcWritable.Buffer.class); this.client = CLIENTS.getClient(conf, factory, RpcWritable.Buffer.class);
@ -218,8 +218,6 @@ public class ProtobufRpcEngine implements RpcEngine {
traceScope = tracer.newScope(RpcClientUtil.methodToTraceString(method)); traceScope = tracer.newScope(RpcClientUtil.methodToTraceString(method));
} }
RequestHeaderProto rpcRequestHeader = constructRpcRequestHeader(method);
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace(Thread.currentThread().getId() + ": Call -> " + LOG.trace(Thread.currentThread().getId() + ": Call -> " +
remoteId + ": " + method.getName() + remoteId + ": " + method.getName() +
@ -231,7 +229,7 @@ public class ProtobufRpcEngine implements RpcEngine {
final RpcWritable.Buffer val; final RpcWritable.Buffer val;
try { try {
val = (RpcWritable.Buffer) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER, val = (RpcWritable.Buffer) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER,
new RpcProtobufRequest(rpcRequestHeader, theRequest), remoteId, constructRpcRequest(method, theRequest), remoteId,
fallbackToSimpleAuth, alignmentContext); fallbackToSimpleAuth, alignmentContext);
} catch (Throwable e) { } catch (Throwable e) {
@ -276,6 +274,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, private Message getReturnMessage(final Method method,
final RpcWritable.Buffer buf) throws ServiceException { final RpcWritable.Buffer buf) throws ServiceException {
Message prototype = null; Message prototype = null;
@ -325,6 +328,14 @@ public class ProtobufRpcEngine implements RpcEngine {
public ConnectionId getConnectionId() { public ConnectionId getConnectionId() {
return remoteId; return remoteId;
} }
protected long getClientProtocolVersion() {
return clientProtocolVersion;
}
protected String getProtocolName() {
return protocolName;
}
} }
@VisibleForTesting @VisibleForTesting
@ -504,6 +515,13 @@ public class ProtobufRpcEngine implements RpcEngine {
String declaringClassProtoName = String declaringClassProtoName =
rpcRequest.getDeclaringClassProtocolName(); rpcRequest.getDeclaringClassProtocolName();
long clientVersion = rpcRequest.getClientProtocolVersion(); long clientVersion = rpcRequest.getClientProtocolVersion();
return call(server, connectionProtocolName, request, receiveTime,
methodName, declaringClassProtoName, clientVersion);
}
protected Writable call(RPC.Server server, String connectionProtocolName,
RpcWritable.Buffer request, long receiveTime, String methodName,
String declaringClassProtoName, long clientVersion) throws Exception {
if (server.verbose) if (server.verbose)
LOG.info("Call: connectionProtocolName=" + connectionProtocolName + LOG.info("Call: connectionProtocolName=" + connectionProtocolName +
", method=" + methodName); ", method=" + methodName);