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 92cc72a..649a521 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 @@ -32,7 +32,7 @@ static final ThreadLocal dateFormat = new ThreadLocal() { @Override protected SimpleDateFormat initialValue() { - return new SimpleDateFormat("d-MMM-yyyy HH:mm:ss"); + return new SimpleDateFormat("EEE MMM dd HH:mm:ss Z yyyy"); } }; 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 0c683e7..0ecff7a 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,27 @@ function renderHadoopDate(data, type, full) { if(data === '0'|| data === '-1') { return "N/A"; } - return new Date(parseInt(data)).toUTCString(); + var date = new Date(parseInt(data)); + var monthList = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + var weekdayList = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; + var offsetMinutes = date.getTimezoneOffset(); + var offset + if (offsetMinutes <= 0) { + offset = "+" + ("000" + (-offsetMinutes / 60 * 100)).slice(-4); + } else { + offset = "-" + ("000" + (offsetMinutes / 60 * 100)).slice(-4); + } + + // EEE MMM dd HH:mm:ss Z yyyy + return weekdayList[date.getDay()] + " " + + monthList[date.getMonth()] + " " + + date.getDate() + " " + + date.getHours() + ":" + + date.getMinutes() + ":" + + date.getSeconds() + " " + + offset + " " + + date.getFullYear(); } // 'sort', 'type' and undefined all just use the number // If date is 0, then for purposes of sorting it should be consider max_int