diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java index b36edec..82b0e60 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Times.java @@ -18,19 +18,12 @@ package org.apache.hadoop.yarn.util; -import java.text.SimpleDateFormat; import java.util.Date; import org.apache.hadoop.classification.InterfaceAudience.Private; @Private public class Times { - static final ThreadLocal dateFormat = - new ThreadLocal() { - @Override protected SimpleDateFormat initialValue() { - return new SimpleDateFormat("d-MMM-yyyy HH:mm:ss"); - } - }; public static long elapsed(long started, long finished) { return Times.elapsed(started, finished, true); @@ -48,7 +41,6 @@ public static long elapsed(long started, long finished, boolean isRunning) { } public static String format(long ts) { - return ts > 0 ? String.valueOf(dateFormat.get().format(new Date(ts))) - : "N/A"; + return ts > 0 ? new Date(ts).toString() : "N/A"; } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js index 1179a7d..17e582e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js @@ -78,7 +78,7 @@ function renderHadoopDate(data, type, full) { if(data === '0'|| data === '-1') { return "N/A"; } - return new Date(parseInt(data)).toUTCString(); + return new Date(parseInt(data)).toLocaleString(); } // 'sort', 'type' and undefined all just use the number // If date is 0, then for purposes of sorting it should be consider max_int