svn commit: r741326 - in /hadoop/core/trunk: CHANGES.txt src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java

[cdouglas]

Author: cdouglas
Date: Thu Feb  5 22:40:36 2009
New Revision: 741326

URL: http://svn.apache.org/viewvc?rev=741326&view=rev
Log:
HADOOP-4960. Use datasource time, rather than system time, during metrics
demux. Contributed by Eric Yang.

Modified:
    hadoop/core/trunk/CHANGES.txt
    
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=741326&r1=741325&r2=741326&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Feb  5 22:40:36 2009
@@ -95,6 +95,9 @@
     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

Modified: 
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java?rev=741326&r1=741325&r2=741326&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java
 (original)
+++ 
hadoop/core/trunk/src/contrib/chukwa/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/HadoopMetricsProcessor.java
 Thu Feb  5 22:40:36 2009
@@ -77,7 +77,7 @@
                                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());