svn commit: r1409648 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcEngine.java

[st...@apache.org]

Author: stack
Date: Thu Nov 15 05:26:17 2012
New Revision: 1409648

URL: http://svn.apache.org/viewvc?rev=1409648&view=rev
Log:
HBASE-6282 The introspection, etc. of objects in the RPC has to be handled for PB objects

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcEngine.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcEngine.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcEngine.java?rev=1409648&r1=1409647&r2=1409648&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcEngine.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcEngine.java Thu Nov 15 05:26:17 2012
@@ -325,7 +325,7 @@ class ProtobufRpcEngine implements RpcEn
         //which implementation of the protocol should be used to service the
         //current request, etc. Ideally, we shouldn't land up in a situation
         //where we need to support such a use case.
-        //For now the clientVersion field is simply ignored 
+        //For now the clientVersion field is simply ignored
         long clientVersion = rpcRequest.getClientProtocolVersion();
 
         if (verbose) {
@@ -333,10 +333,10 @@ class ProtobufRpcEngine implements RpcEn
               ", method=" + methodName);
         }
 
-        status.setRPC(rpcRequest.getMethodName(), 
+        status.setRPC(rpcRequest.getMethodName(),
             new Object[]{rpcRequest.getRequest()}, receiveTime);
         status.setRPCPacket(rpcRequest);
-        status.resume("Servicing call");        
+        status.resume("Servicing call");
         //get an instance of the method arg type
         Message protoType = getMethodArgType(method);
         Message param = protoType.newBuilderForType()
@@ -366,10 +366,11 @@ class ProtobufRpcEngine implements RpcEn
         int qTime = (int) (startTime-receiveTime);
         if (TRACELOG.isDebugEnabled()) {
           TRACELOG.debug("Call #" + CurCall.get().id +
-              "; Served: " + protocol.getSimpleName()+"#"+method.getName() +
-              " queueTime=" + qTime +
-              " processingTime=" + processingTime +
-              " contents=" + param.toString());
+              "; served=" + protocol.getSimpleName() + "#" + method.getName() +
+              ", queueTime=" + qTime +
+              ", processingTime=" + processingTime +
+              ", request=" + param.toString() +
+              " response=" + result.toString());
         }
         rpcMetrics.rpcQueueTime.inc(qTime);
         rpcMetrics.rpcProcessingTime.inc(processingTime);
@@ -393,7 +394,7 @@ class ProtobufRpcEngine implements RpcEn
           buffer.append(param.getClass().getName());
           buffer.append(")");
           buffer.append(", client version="+clientVersion);
-          logResponse(new Object[]{rpcRequest.getRequest()}, 
+          logResponse(new Object[]{rpcRequest.getRequest()},
               methodName, buffer.toString(), (tooLarge ? "TooLarge" : "TooSlow"),
               status.getClient(), startTime, processingTime, qTime,
               responseSize);