Преглед на файлове

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

Doroszlai, Attila преди 5 години
родител
ревизия
64ed6b177d

+ 5 - 2
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java

@@ -156,8 +156,11 @@ public class RpcClient implements ClientProtocol {
     this.userRights = aclConfig.getUserDefaultRights();
     this.userRights = aclConfig.getUserDefaultRights();
     this.groupRights = aclConfig.getGroupDefaultRights();
     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 =
     long scmVersion =
         RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class);
         RPC.getProtocolVersion(StorageContainerLocationProtocolPB.class);
     InetSocketAddress scmAddress = getScmAddressForClient();
     InetSocketAddress scmAddress = getScmAddressForClient();

+ 2 - 3
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java

@@ -207,10 +207,9 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
         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),
-        OzoneManagerProtocolPB.class, conf);
+            sleepBase, sleepMax);
     this.clientID = clientId;
     this.clientID = clientId;
   }
   }