Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 59412200B6F for ; Wed, 10 Aug 2016 00:33:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 58335160AB7; Tue, 9 Aug 2016 22:33:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9B892160AAD for ; Wed, 10 Aug 2016 00:33:51 +0200 (CEST) Received: (qmail 21928 invoked by uid 500); 9 Aug 2016 22:33:45 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 20814 invoked by uid 99); 9 Aug 2016 22:33:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2016 22:33:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A823EEE3D; Tue, 9 Aug 2016 22:33:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Date: Tue, 09 Aug 2016 22:34:08 -0000 Message-Id: <8771dd0864b4450db4a7edf84a0fbba8@git.apache.org> In-Reply-To: <2d0cfdd5d59943dbae271116eabdd2d4@git.apache.org> References: <2d0cfdd5d59943dbae271116eabdd2d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/50] [abbrv] hadoop git commit: HADOOP-13473. Tracing in IPC Server is broken. Contributed by Daryn Sharp. archived-at: Tue, 09 Aug 2016 22:33:52 -0000 HADOOP-13473. Tracing in IPC Server is broken. Contributed by Daryn Sharp. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/caf800d5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/caf800d5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/caf800d5 Branch: refs/heads/YARN-3368 Commit: caf800d5290d8618003b764afb0b3ef8d9a5a0a8 Parents: c4b77ae Author: Kihwal Lee Authored: Tue Aug 9 14:33:15 2016 -0500 Committer: Kihwal Lee Committed: Tue Aug 9 14:33:15 2016 -0500 ---------------------------------------------------------------------- .../apache/hadoop/ipc/ProtobufRpcEngine.java | 36 +++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/caf800d5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java ---------------------------------------------------------------------- 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 cce5166..eb30aa2 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 @@ -69,7 +69,7 @@ public class ProtobufRpcEngine implements RpcEngine { static { // Register the rpcRequest deserializer for WritableRpcEngine org.apache.hadoop.ipc.Server.registerProtocolEngine( - RPC.RpcKind.RPC_PROTOCOL_BUFFER, RpcWritable.Buffer.class, + RPC.RpcKind.RPC_PROTOCOL_BUFFER, RpcProtobufRequest.class, new Server.ProtoBufRpcInvoker()); } @@ -613,9 +613,8 @@ public class ProtobufRpcEngine implements RpcEngine { */ public Writable call(RPC.Server server, String connectionProtocolName, Writable writableRequest, long receiveTime) throws Exception { - RpcWritable.Buffer request = (RpcWritable.Buffer) writableRequest; - RequestHeaderProto rpcRequest = - request.getValue(RequestHeaderProto.getDefaultInstance()); + RpcProtobufRequest request = (RpcProtobufRequest) writableRequest; + RequestHeaderProto rpcRequest = request.getRequestHeader(); String methodName = rpcRequest.getMethodName(); /** @@ -687,4 +686,33 @@ public class ProtobufRpcEngine implements RpcEngine { } } } + + // htrace in the ipc layer creates the span name based on toString() + // which uses the rpc header. in the normal case we want to defer decoding + // the rpc header until needed by the rpc engine. + static class RpcProtobufRequest extends RpcWritable.Buffer { + private RequestHeaderProto lazyHeader; + + public RpcProtobufRequest() { + } + + synchronized RequestHeaderProto getRequestHeader() throws IOException { + if (lazyHeader == null) { + lazyHeader = getValue(RequestHeaderProto.getDefaultInstance()); + } + return lazyHeader; + } + + // this is used by htrace to name the span. + @Override + public String toString() { + try { + RequestHeaderProto header = getRequestHeader(); + return header.getDeclaringClassProtocolName() + "." + + header.getMethodName(); + } catch (IOException e) { + throw new IllegalArgumentException(e); + } + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org