You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/10/10 21:00:50 UTC
[11/50] [abbrv] git commit: HDFS-7157. Using Time.now() for recording
start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe)
(cherry picked from commit b3d5d269a73a1826ebf6f637a0dbd69f6261dbcb)
HDFS-7157. Using Time.now() for recording start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe)
(cherry picked from commit b3d5d269a73a1826ebf6f637a0dbd69f6261dbcb)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b5882ddf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b5882ddf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b5882ddf
Branch: refs/heads/champlain
Commit: b5882ddf6b67c39e2fd7064b27a94f398773f9e2
Parents: 3373958
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Mon Sep 29 11:29:54 2014 -0700
Committer: Jitendra Pandey <Ji...@Jitendra-Pandeys-MacBook-Pro-4.local>
Committed: Wed Oct 8 23:07:46 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5882ddf/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 68a145d..f3ef5ab 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -435,6 +435,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting.
(Charles Lamb via wheat9)
+ HDFS-7157. Using Time.now() for recording start/end time of reconfiguration
+ tasks (Lei Xu via cmccabe)
+
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
HADOOP-10734. Implement high-performance secure random number sources.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5882ddf/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
index 7521650..3248b9a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
@@ -134,7 +134,7 @@ public abstract class ReconfigurableBase
}
synchronized (this.parent.reconfigLock) {
- this.parent.endTime = Time.monotonicNow();
+ this.parent.endTime = Time.now();
this.parent.status = Collections.unmodifiableMap(results);
this.parent.reconfigThread = null;
}
@@ -160,7 +160,7 @@ public abstract class ReconfigurableBase
reconfigThread.setDaemon(true);
reconfigThread.setName("Reconfiguration Task");
reconfigThread.start();
- startTime = Time.monotonicNow();
+ startTime = Time.now();
}
}