Author: sradia
Date: Thu May 16 01:17:43 2013
New Revision: 1483142
URL: http://svn.apache.org/r1483142
Log:
Merged in HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1446428
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1483142&r1=1483141&r2=1483142&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu May 16 01:17:43 2013
@@ -65,6 +65,8 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9140 Cleanup rpc PB protos (sanjay Radia)
+ HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia)
+
OPTIMIZATIONS
HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1446428
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1446428
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1446428
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java?rev=1483142&r1=1483141&r2=1483142&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
Thu May 16 01:17:43 2013
@@ -62,7 +62,7 @@ public class ProtobufRpcEngine implement
static { // Register the rpcRequest deserializer for WritableRpcEngine
org.apache.hadoop.ipc.Server.registerProtocolEngine(
- RPC.RpcKind.RPC_PROTOCOL_BUFFER, RpcRequestWritable.class,
+ RPC.RpcKind.RPC_PROTOCOL_BUFFER, RpcRequestWrapper.class,
new Server.ProtoBufRpcInvoker());
}
@@ -122,7 +122,7 @@ public class ProtobufRpcEngine implement
public Invoker(Class<?> protocol, Client.ConnectionId connId,
Configuration conf, SocketFactory factory) {
this.remoteId = connId;
- this.client = CLIENTS.getClient(conf, factory,
RpcResponseWritable.class);
+ this.client = CLIENTS.getClient(conf, factory, RpcResponseWrapper.class);
this.protocolName = RPC.getProtocolName(protocol);
this.clientProtocolVersion = RPC
.getProtocolVersion(protocol);
@@ -191,7 +191,7 @@ public class ProtobufRpcEngine implement
}
RequestProto rpcRequest = constructRpcRequest(method, args);
- RpcResponseWritable val = null;
+ RpcResponseWrapper val = null;
if (LOG.isTraceEnabled()) {
LOG.trace(Thread.currentThread().getId() + ": Call -> " +
@@ -199,8 +199,8 @@ public class ProtobufRpcEngine implement
" {" + TextFormat.shortDebugString((Message) args[1]) + "}");
}
try {
- val = (RpcResponseWritable)
client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER,
- new RpcRequestWritable(rpcRequest), remoteId);
+ val = (RpcResponseWrapper) client.call(RPC.RpcKind.RPC_PROTOCOL_BUFFER,
+ new RpcRequestWrapper(rpcRequest), remoteId);
} catch (Throwable e) {
if (LOG.isTraceEnabled()) {
@@ -268,16 +268,20 @@ public class ProtobufRpcEngine implement
}
/**
- * Writable Wrapper for Protocol Buffer Requests
+ * Wrapper for Protocol Buffer Requests
+ *
+ * Note while this wrapper is writable, the request on the wire is in
+ * Protobuf. Several methods on {@link org.apache.hadoop.ipc.Server and RPC}
+ * use type Writable as a wrapper to work across multiple RpcEngine kinds.
*/
- private static class RpcRequestWritable implements Writable {
+ private static class RpcRequestWrapper implements Writable {
RequestProto message;
@SuppressWarnings("unused")
- public RpcRequestWritable() {
+ public RpcRequestWrapper() {
}
- RpcRequestWritable(RequestProto message) {
+ RpcRequestWrapper(RequestProto message) {
this.message = message;
}
@@ -303,16 +307,20 @@ public class ProtobufRpcEngine implement
}
/**
- * Writable Wrapper for Protocol Buffer Responses
+ * Wrapper for Protocol Buffer Responses
+ *
+ * Note while this wrapper is writable, the request on the wire is in
+ * Protobuf. Several methods on {@link org.apache.hadoop.ipc.Server and RPC}
+ * use type Writable as a wrapper to work across multiple RpcEngine kinds.
*/
- private static class RpcResponseWritable implements Writable {
+ private static class RpcResponseWrapper implements Writable {
byte[] responseMessage;
@SuppressWarnings("unused")
- public RpcResponseWritable() {
+ public RpcResponseWrapper() {
}
- public RpcResponseWritable(Message message) {
+ public RpcResponseWrapper(Message message) {
this.responseMessage = message.toByteArray();
}
@@ -336,7 +344,7 @@ public class ProtobufRpcEngine implement
@InterfaceStability.Unstable
static Client getClient(Configuration conf) {
return CLIENTS.getClient(conf, SocketFactory.getDefault(),
- RpcResponseWritable.class);
+ RpcResponseWrapper.class);
}
@@ -425,7 +433,7 @@ public class ProtobufRpcEngine implement
*/
public Writable call(RPC.Server server, String protocol,
Writable writableRequest, long receiveTime) throws Exception {
- RpcRequestWritable request = (RpcRequestWritable) writableRequest;
+ RpcRequestWrapper request = (RpcRequestWrapper) writableRequest;
RequestProto rpcRequest = request.message;
String methodName = rpcRequest.getMethodName();
String protoName = rpcRequest.getDeclaringClassProtocolName();
@@ -467,7 +475,7 @@ public class ProtobufRpcEngine implement
} catch (Exception e) {
throw e;
}
- return new RpcResponseWritable(result);
+ return new RpcResponseWrapper(result);
}
}
}
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1446428
