HADOOP-5551. Merge -r 760097:760098 from trunk to branch 0.20.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@760105 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -679,7 +679,7 @@ Release 0.20.0 - Unreleased
     Total-Output/Total-Input. (Sharad Agarwal via ddas)
 
     HADOOP-5142. Fix MapWritable#putAll to store key/value classes. 
-    (Doğacan Güney via enis)
+    (Do??acan G??ney via enis)
 
     HADOOP-4744. Workaround for jetty6 returning -1 when getLocalPort
     is invoked on the connector. The workaround patch retries a few
@@ -894,6 +894,9 @@ Release 0.19.2 - Unreleased
     HADOOP-4780. Cache the size of directories in DistributedCache, avoiding
     long delays in recalculating it. (He Yongqiang via cdouglas)
 
+    HADOOP-5551. Prevent directory destruction on file create.
+    (Brian Bockelman via shv)
+
 Release 0.19.1 - 2009-02-23 
 
   IMPROVEMENTS

src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

@@ -998,8 +998,15 @@ public class FSNamesystem implements FSConstants, FSNamesystemMBean {
     if (!DFSUtil.isValidName(src)) {
       throw new IOException("Invalid file name: " + src);
     }
+
+    // Verify that the destination does not exist as a directory already.
+    boolean pathExists = dir.exists(src);
+    if (pathExists && dir.isDir(src)) {
+      throw new IOException("Cannot create file "+ src + "; already exists as a directory.");
+    }
+
     if (isPermissionEnabled) {
-      if (append || (overwrite && dir.exists(src))) {
+      if (append || (overwrite && pathExists)) {
         checkPathAccess(src, FsAction.WRITE);
       }
       else {

src/test/org/apache/hadoop/hdfs/TestFileCreation.java

@@ -187,6 +187,22 @@ public class TestFileCreation extends junit.framework.TestCase {
       System.out.println(fs.getFileStatus(path).isDir()); 
       assertTrue("/ should be a directory", 
                  fs.getFileStatus(path).isDir() == true);
+
+      //
+      // Create a directory inside /, then try to overwrite it
+      //
+      Path dir1 = new Path("/test_dir");
+      fs.mkdirs(dir1);
+      System.out.println("createFile: Creating " + dir1.getName() + 
+        " for overwrite of existing directory.");
+      try {
+        fs.create(dir1, true); // Create path, overwrite=true
+        fs.close();
+        assertTrue("Did not prevent directory from being overwritten.", false);
+      } catch (IOException ie) {
+        if (!ie.getMessage().contains("already exists as a directory."))
+          throw ie;
+      }
       
       // create a new file in home directory. Do not close it.
       //