This is an automated email from the ASF dual-hosted git repository. jlowe pushed a commit to branch branch-3.1.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1.2 by this push: new 9f88af7 Revert "HDFS-14084. Need for more stats in DFSClient. Contributed by Pranay Singh." 9f88af7 is described below commit 9f88af79029606b29a5d0ff9bea661a2a83a1dfb Author: Jason Lowe <jl...@apache.org> AuthorDate: Wed Jan 9 17:52:26 2019 -0600 Revert "HDFS-14084. Need for more stats in DFSClient. Contributed by Pranay Singh." This reverts commit e8e55839a0c2b5479d7a25256ed1db751e09c122. --- .../main/java/org/apache/hadoop/ipc/Client.java | 25 ---------------------- .../org/apache/hadoop/ipc/ProtobufRpcEngine.java | 16 +++----------- .../hadoop/ipc/metrics/RpcDetailedMetrics.java | 12 ++++------- 3 files changed, 7 insertions(+), 46 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java index f01ac30..07a2f13 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java @@ -34,7 +34,6 @@ import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.io.retry.RetryPolicies; import org.apache.hadoop.io.retry.RetryPolicy; import org.apache.hadoop.io.retry.RetryPolicy.RetryAction; -import org.apache.hadoop.ipc.metrics.RpcDetailedMetrics; import org.apache.hadoop.ipc.RPC.RpcKind; import org.apache.hadoop.ipc.Server.AuthProtocol; import org.apache.hadoop.ipc.protobuf.IpcConnectionContextProtos.IpcConnectionContextProto; @@ -87,7 +86,6 @@ import static org.apache.hadoop.ipc.RpcConstants.PING_CALL_ID; public class Client implements AutoCloseable { public static final Logger LOG = LoggerFactory.getLogger(Client.class); - private final RpcDetailedMetrics rpcDetailedMetrics; /** A counter for generating call IDs. */ private static final AtomicInteger callIdCounter = new AtomicInteger(); @@ -211,24 +209,6 @@ public class Client implements AutoCloseable { }; /** - * Update a particular metric by recording the processing - * time of the metric. - * - * @param name Metric name - * @param processingTime time spent in processing the metric. - */ - public void updateMetrics(String name, long processingTime) { - rpcDetailedMetrics.addProcessingTime(name, processingTime); - } - - /** - * Get the RpcDetailedMetrics associated with the Client. - */ - public RpcDetailedMetrics getRpcDetailedMetrics() { - return rpcDetailedMetrics; - } - - /** * set the ping interval value in configuration * * @param conf Configuration @@ -1321,11 +1301,6 @@ public class Client implements AutoCloseable { this.maxAsyncCalls = conf.getInt( CommonConfigurationKeys.IPC_CLIENT_ASYNC_CALLS_MAX_KEY, CommonConfigurationKeys.IPC_CLIENT_ASYNC_CALLS_MAX_DEFAULT); - /** - * Create with port of -1, dummy port since the function - * takes default argument. - */ - this.rpcDetailedMetrics = RpcDetailedMetrics.create(-1); } /** 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 fa3b61a..639bbad 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 @@ -49,8 +49,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hadoop.metrics2.MetricStringBuilder; -import org.apache.hadoop.metrics2.lib.MutableRatesWithAggregation; /** * RPC Engine for for protobuf based RPCs. @@ -192,7 +190,7 @@ public class ProtobufRpcEngine implements RpcEngine { throws ServiceException { long startTime = 0; if (LOG.isDebugEnabled()) { - startTime = System.currentTimeMillis(); + startTime = Time.now(); } if (args.length != 2) { // RpcController + Message @@ -247,16 +245,8 @@ public class ProtobufRpcEngine implements RpcEngine { } if (LOG.isDebugEnabled()) { - long callTime = System.currentTimeMillis() - startTime; - if (callTime > 0) { - MetricStringBuilder rb = - new MetricStringBuilder(null, "", " = ", "\n"); - client.updateMetrics(method.getName(), callTime); - MutableRatesWithAggregation rates = - client.getRpcDetailedMetrics().getMutableRates(); - rates.snapshot(rb, true); - LOG.debug("RPC Client stats: {}", rb); - } + long callTime = Time.now() - startTime; + LOG.debug("Call: " + method.getName() + " took " + callTime + "ms"); } if (Client.isAsynchronousMode()) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java index 9be9c5a..6ed57ec 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java @@ -70,16 +70,12 @@ public class RpcDetailedMetrics { * @param processingTime the processing time */ //@Override // some instrumentation interface - public void addProcessingTime(String metName, long processingTime) { - rates.add(metName, processingTime); + public void addProcessingTime(String name, int processingTime) { + rates.add(name, processingTime); } - public void addDeferredProcessingTime(String metName, long processingTime) { - deferredRpcRates.add(metName, processingTime); - } - - public MutableRatesWithAggregation getMutableRates() { - return rates; + public void addDeferredProcessingTime(String name, long processingTime) { + deferredRpcRates.add(name, processingTime); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org