HADOOP-4960. Use datasource time, rather than system time, during metrics

demux. Contributed by Eric Yang.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@741326 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -95,6 +95,9 @@ Trunk (unreleased changes)
     HADOOP-5045. FileSystem.isDirectory() should not be deprecated.  (Suresh
     Srinivas via szetszwo)
 
+    HADOOP-4960. Use datasource time, rather than system time, during metrics
+    demux. (Eric Yang via cdouglas)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java

@@ -77,7 +77,7 @@ public class HadoopMetricsProcessor extends AbstractProcessor {
 				if (chukwaTimestampField.intern() == keyName.intern()) {
 					d = new Date(json.getLong(keyName));
 					Calendar cal = Calendar.getInstance();
-					cal.setTimeInMillis(System.currentTimeMillis());
+					cal.setTimeInMillis(d.getTime());
 					cal.set(Calendar.SECOND, 0);
 					cal.set(Calendar.MILLISECOND, 0);
 					d.setTime(cal.getTimeInMillis());