svn commit: r1035145 - in /hadoop/hdfs/trunk: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java

[eli]

Author: eli
Date: Mon Nov 15 05:01:33 2010
New Revision: 1035145

URL: http://svn.apache.org/viewvc?rev=1035145&view=rev
Log:
HDFS-1498. FSDirectory#unprotectedConcat calls setModificationTime on a file. 
Contributed by Eli Collins

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1035145&r1=1035144&r2=1035145&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Mon Nov 15 05:01:33 2010
@@ -330,6 +330,9 @@ Trunk (unreleased changes)
     other's service policies.  (Aaron T. Myers via tomwhite)
 
     HDFS-1440. Fix TestComputeInvalidateWork failure. (suresh)
+ 
+    HDFS-1498. FSDirectory#unprotectedConcat calls setModificationTime 
+    on a file. (eli)
 
 Release 0.21.1 - Unreleased
 

Modified: 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=1035145&r1=1035144&r2=1035145&view=diff
==============================================================================
--- 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 (original)
+++ 
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 Mon Nov 15 05:01:33 2010
@@ -990,7 +990,7 @@ class FSDirectory implements Closeable {
     }
     
     long now = now();
-    trgInode.setModificationTime(now);
+    trgInode.setModificationTimeForce(now);
     trgParent.setModificationTime(now);
     // update quota on the parent directory ('count' files removed, 0 space)
     unprotectedUpdateCount(trgINodes, trgINodes.length-1, - count, 0);