Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11271. Use Time.monotonicNow() in Shell.java instead of Time.now() (Contributed by Vinayakumar B) 

(cherry picked from commit 8e9502e05d)
This commit is contained in:
Vinayakumar B 2014-11-05 14:47:52 +05:30
parent 46c29b988d
commit 2d0c56e898
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -54,6 +54,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11269. Add java 8 profile for hadoop-annotations. (Li Lu via wheat9) HADOOP-11269. Add java 8 profile for hadoop-annotations. (Li Lu via wheat9)
HADOOP-11271. Use Time.monotonicNow() in Shell.java instead of Time.now()
(vinayakumarb)
Release 2.6.0 - UNRELEASED Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
View File

@ -449,7 +449,7 @@ abstract public class Shell {
/** check to see if a command needs to be executed and execute if needed */ /** check to see if a command needs to be executed and execute if needed */
protected void run() throws IOException { protected void run() throws IOException {
if (lastTime + interval > Time.now()) if (lastTime + interval > Time.monotonicNow())
return; return;
exitCode = 0; // reset for next run exitCode = 0; // reset for next run
runCommand(); runCommand();
@ -578,7 +578,7 @@ abstract public class Shell {
LOG.warn("Error while closing the error stream", ioe); LOG.warn("Error while closing the error stream", ioe);
} }
process.destroy(); process.destroy();
lastTime = Time.now(); lastTime = Time.monotonicNow();
} }
} }