Repository: hive Updated Branches: refs/heads/llap d567cc445 -> 41178e39d
HIVE-10730. LLAP: fix guava stopwatch conflict. (Siddharth Seth) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/41178e39 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/41178e39 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/41178e39 Branch: refs/heads/llap Commit: 41178e39ddc5d43ff4abe0b147fd902617944aa3 Parents: d567cc4 Author: Siddharth Seth <ss...@apache.org> Authored: Fri May 15 14:59:07 2015 -0700 Committer: Siddharth Seth <ss...@apache.org> Committed: Fri May 15 14:59:07 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/41178e39/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java index b16a5c4..36f2246 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.conf.Configuration; @@ -212,7 +211,7 @@ public class TaskRunnerCallable extends CallableWithNdc<TaskRunner2Result> { // TODO Fix UGI and FS Handling. Closing UGI here causes some errors right now. // FileSystem.closeAllForUGI(taskUgi); LOG.info("ExecutionTime for Container: " + request.getContainerIdString() + "=" + - runtimeWatch.stop().elapsed(TimeUnit.MILLISECONDS)); + runtimeWatch.stop().elapsedMillis(); if (LOG.isDebugEnabled()) { LOG.debug("canFinish post completion: " + taskSpec.getTaskAttemptID() + ": " + canFinish()); } @@ -377,10 +376,10 @@ public class TaskRunnerCallable extends CallableWithNdc<TaskRunner2Result> { LOG.info("Killed task {}", requestId); if (killtimerWatch.isRunning()) { killtimerWatch.stop(); - long elapsed = killtimerWatch.elapsed(TimeUnit.MILLISECONDS); + long elapsed = killtimerWatch.elapsedMillis(); LOG.info("Time to die for task {}", elapsed); } - metrics.incrPreemptionTimeLost(runtimeWatch.elapsed(TimeUnit.MILLISECONDS)); + metrics.incrPreemptionTimeLost(runtimeWatch.elapsedMillis(); metrics.incrExecutorTotalKilled(); break; case COMMUNICATION_FAILURE: