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 na...@apache.org on 2019/09/12 13:23:53 UTC
[hadoop] branch ozone-0.4.1 updated: HDDS-2075. Tracing in
OzoneManager call is propagated with wrong parent (#1415)
This is an automated email from the ASF dual-hosted git repository.
nanda pushed a commit to branch ozone-0.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/ozone-0.4.1 by this push:
new d8c98c5 HDDS-2075. Tracing in OzoneManager call is propagated with wrong parent (#1415)
d8c98c5 is described below
commit d8c98c5fc138734d51794bda5cf83984628095cd
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Wed Sep 11 20:59:01 2019 +0200
HDDS-2075. Tracing in OzoneManager call is propagated with wrong parent (#1415)
(cherry picked from commit 64ed6b177d6b00b22d45576a8517432dc6c03348)
---
.../main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java | 7 +++++--
.../om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java | 5 ++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index 0bbcd03..8e3deb1 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -150,8 +150,11 @@ public class RpcClient implements ClientProtocol {
this.userRights = aclConfig.getUserDefaultRights();
this.groupRights = aclConfig.getGroupDefaultRights();
- this.ozoneManagerClient = new OzoneManagerProtocolClientSideTranslatorPB(
- this.conf, clientId.toString(), ugi);
+ this.ozoneManagerClient = TracingUtil.createProxy(
+ new OzoneManagerProtocolClientSideTranslatorPB(
+ this.conf, clientId.toString(), ugi),
+ OzoneManagerProtocol.class, conf
+ );
long scmVersion =
RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class);
InetSocketAddress scmAddress = getScmAddressForClient();
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
index 094e689..44db898 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
@@ -202,10 +202,9 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_KEY,
OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_DEFAULT);
- this.rpcProxy = TracingUtil.createProxy(
+ this.rpcProxy =
createRetryProxy(omFailoverProxyProvider, maxRetries, maxFailovers,
- sleepBase, sleepMax),
- OzoneManagerProtocolPB.class, conf);
+ sleepBase, sleepMax);
this.clientID = clientId;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org