YARN-1845. Elapsed time for failed tasks that never started is wrong (Rushabh S Shah via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578460 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -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 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java

@@ -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) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js

@@ -75,7 +75,7 @@ jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay )
 
 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, full) {
   }
   //Return the title attribute for 'sort', 'filter', 'type' and undefined
   return data.split("'")[1];
-}
+}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestTimes.java

@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestTimes {
+
+  @Test
+  public void testNegativeStartTimes() {
+    long elapsed = Times.elapsed(-5, 10, true);
+    Assert.assertEquals("Elapsed time is not 0", 0, elapsed);
+    elapsed = Times.elapsed(-5, 10, false);
+    Assert.assertEquals("Elapsed time is not -1", -1, elapsed);
+  }
+
+  @Test
+  public void testNegativeFinishTimes() {
+    long elapsed = Times.elapsed(5, -10, false);
+    Assert.assertEquals("Elapsed time is not -1", -1, elapsed);
+  }
+
+  @Test
+  public void testNegativeStartandFinishTimes() {
+    long elapsed = Times.elapsed(-5, -10, false);
+    Assert.assertEquals("Elapsed time is not -1", -1, elapsed);
+  }
+
+  @Test
+  public void testPositiveStartandFinishTimes() {
+    long elapsed = Times.elapsed(5, 10, true);
+    Assert.assertEquals("Elapsed time is not 5", 5, elapsed);
+    elapsed = Times.elapsed(5, 10, false);
+    Assert.assertEquals("Elapsed time is not 5", 5, elapsed);
+  }
+}