Revert "HADOOP-14732. ProtobufRpcEngine should use Time.monotonicNow to measure durations. Contributed by Hanisha Koneru."
This reverts commit bdc425057ebedb8f0988ce4dae18fdcd67c8523f. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/85059313 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/85059313 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/85059313 Branch: refs/heads/branch-2 Commit: 850593133b21573da199e2fbc4b9b870ab15ceba Parents: ecf1a02 Author: Arpit Agarwal <[email protected]> Authored: Fri Aug 18 10:16:13 2017 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Fri Aug 18 10:16:13 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/ipc/ProtobufRpcEngine.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/85059313/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 b7d04b4..190c550 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 @@ -190,7 +190,7 @@ public class ProtobufRpcEngine implements RpcEngine { throws ServiceException { long startTime = 0; if (LOG.isDebugEnabled()) { - startTime = Time.monotonicNow(); + startTime = Time.now(); } if (args.length != 2) { // RpcController + Message @@ -244,7 +244,7 @@ public class ProtobufRpcEngine implements RpcEngine { } if (LOG.isDebugEnabled()) { - long callTime = Time.monotonicNow() - startTime; + long callTime = Time.now() - startTime; LOG.debug("Call: " + method.getName() + " took " + callTime + "ms"); } @@ -372,19 +372,19 @@ public class ProtobufRpcEngine implements RpcEngine { this.server = currentCallInfo.get().server; this.call = Server.getCurCall().get(); this.methodName = currentCallInfo.get().methodName; - this.setupTime = Time.monotonicNow(); + this.setupTime = Time.now(); } @Override public void setResponse(Message message) { - long processingTime = Time.monotonicNow() - setupTime; + long processingTime = Time.now() - setupTime; call.setDeferredResponse(RpcWritable.wrap(message)); server.updateDeferredMetrics(methodName, processingTime); } @Override public void error(Throwable t) { - long processingTime = Time.monotonicNow() - setupTime; + long processingTime = Time.now() - setupTime; String detailedMetricsName = t.getClass().getSimpleName(); server.updateDeferredMetrics(detailedMetricsName, processingTime); call.setDeferredError(t); @@ -493,7 +493,7 @@ public class ProtobufRpcEngine implements RpcEngine { Message param = request.getValue(prototype); Message result; - long startTime = Time.monotonicNow(); + long startTime = Time.now(); int qTime = (int) (startTime - receiveTime); Exception exception = null; boolean isDeferred = false; @@ -517,7 +517,7 @@ public class ProtobufRpcEngine implements RpcEngine { throw e; } finally { currentCallInfo.set(null); - int processingTime = (int) (Time.monotonicNow() - startTime); + int processingTime = (int) (Time.now() - startTime); if (LOG.isDebugEnabled()) { String msg = "Served: " + methodName + (isDeferred ? ", deferred" : "") + --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
