big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-2075. Tracing in OzoneManager call is propagated with wrong parent (#1415)

Browse Source
This commit is contained in:
Doroszlai, Attila 2019-09-11 20:59:01 +02:00 committed by Xiaoyu Yao
parent 9221704f85
commit 64ed6b177d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
View File

@ -156,8 +156,11 @@ public RpcClient(Configuration conf) throws IOException {
this.userRights = aclConfig.getUserDefaultRights(); this.userRights = aclConfig.getUserDefaultRights();
this.groupRights = aclConfig.getGroupDefaultRights(); this.groupRights = aclConfig.getGroupDefaultRights();
this.ozoneManagerClient = new OzoneManagerProtocolClientSideTranslatorPB( this.ozoneManagerClient = TracingUtil.createProxy(
this.conf, clientId.toString(), ugi); new OzoneManagerProtocolClientSideTranslatorPB(
this.conf, clientId.toString(), ugi),
OzoneManagerProtocol.class, conf
);
long scmVersion = long scmVersion =
RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class); RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class);
InetSocketAddress scmAddress = getScmAddressForClient(); InetSocketAddress scmAddress = getScmAddressForClient();

5
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
View File

@ -207,10 +207,9 @@ public OzoneManagerProtocolClientSideTranslatorPB(OzoneConfiguration conf,
OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_KEY, OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_KEY,
OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_DEFAULT); OzoneConfigKeys.OZONE_CLIENT_FAILOVER_SLEEP_MAX_MILLIS_DEFAULT);
this.rpcProxy = TracingUtil.createProxy( this.rpcProxy =
createRetryProxy(omFailoverProxyProvider, maxRetries, maxFailovers, createRetryProxy(omFailoverProxyProvider, maxRetries, maxFailovers,
sleepBase, sleepMax), sleepBase, sleepMax);
OzoneManagerProtocolPB.class, conf);
this.clientID = clientId; this.clientID = clientId;
} }