Author: jeagles
Date: Mon Mar 17 16:56:43 2014
New Revision: 1578460
URL: http://svn.apache.org/r1578460
Log:
YARN-1845. Elapsed time for failed tasks that never started is wrong (Rushabh S
Shah via jeagles)
Added:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestTimes.java
- copied unchanged from r1578459,
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestTimes.java
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1578460&r1=1578459&r2=1578460&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Mon Mar 17
16:56:43 2014
@@ -26,6 +26,9 @@ Release 2.5.0 - UNRELEASED
YARN-1520. update capacity scheduler docs to include necessary parameters
(Chen He via jeagles)
+ YARN-1845. Elapsed time for failed tasks that never started is wrong
+ (Rushabh S Shah via jeagles)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java?rev=1578460&r1=1578459&r2=1578460&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java
Mon Mar 17 16:56:43 2014
@@ -37,7 +37,7 @@ public class Times {
}
public static long elapsed(long started, long finished, boolean isRunning) {
- if (finished > 0) {
+ if (finished > 0 && started > 0) {
return finished - started;
}
if (isRunning) {
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js?rev=1578460&r1=1578459&r2=1578460&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
Mon Mar 17 16:56:43 2014
@@ -75,7 +75,7 @@ jQuery.fn.dataTableExt.oApi.fnSetFilteri
function renderHadoopDate(data, type, full) {
if (type === 'display' || type === 'filter') {
- if(data === '0') {
+ if(data === '0'|| data === '-1') {
return "N/A";
}
return new Date(parseInt(data)).toUTCString();
@@ -143,4 +143,4 @@ function parseHadoopProgress(data, type,
}
//Return the title attribute for 'sort', 'filter', 'type' and undefined
return data.split("'")[1];
-}
\ No newline at end of file
+}
