HDFS-4293. Fix TestSnapshot failure. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1419882 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt

@@ -81,3 +81,5 @@ Branch-2802 Snapshot (Unreleased)
 
   HDFS-4175. Additional snapshot tests for more complicated directory
   structure and modifications. (Jing Zhao via suresh)
+
+  HDFS-4293. Fix TestSnapshot failure. (Jing Zhao via suresh)

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java

@@ -2008,7 +2008,7 @@ public class FSDirectory implements Closeable {
         ((INodeDirectoryWithQuota)dirNode).setQuota(nsQuota, dsQuota);
         if (!dirNode.isQuotaSet()) {
           // will not come here for root because root's nsQuota is always set
-          INodeDirectory newNode = new INodeDirectory(dirNode);
+          INodeDirectory newNode = new INodeDirectory(dirNode, true);
           INodeDirectory parent = (INodeDirectory)inodes[inodes.length-2];
           dirNode = newNode;
           parent.replaceChild(newNode);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java

@@ -73,14 +73,16 @@ public class INodeDirectory extends INode {
     super(name, permissions, null, mtime, 0L);
   }
   
-  /** copy constructor
+  /**
-   * 
+   * Copy constructor
-   * @param other
+   * @param other The INodeDirectory to be copied
+   * @param adopt Indicate whether or not need to set the parent field of child
+   *              INodes to the new node
    */
-  public INodeDirectory(INodeDirectory other) {
+  public INodeDirectory(INodeDirectory other, boolean adopt) {
     super(other);
     this.children = other.children;
-    if (this.children != null) {
+    if (adopt && this.children != null) {
       for (INode child : children) {
         child.parent = this;
       }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java

@@ -44,7 +44,7 @@ public class INodeDirectoryWithQuota extends INodeDirectory {
    */
   protected INodeDirectoryWithQuota(long nsQuota, long dsQuota,
       INodeDirectory other) {
-    super(other);
+    super(other, true);
     INode.DirCounts counts = new INode.DirCounts();
     other.spaceConsumedInTree(counts);
     this.nsCount = counts.getNsCount();

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/SnapshotManager.java

@@ -97,7 +97,7 @@ public class SnapshotManager implements SnapshotStats {
           + "Please redo the operation after removing all the snapshots.");
     }
 
-    final INodeDirectory d = new INodeDirectory(s);
+    final INodeDirectory d = new INodeDirectory(s, true);
     fsdir.replaceINodeDirectory(path, s, d);
     snapshottables.remove(s);
 
@@ -198,7 +198,7 @@ public class SnapshotManager implements SnapshotStats {
      */
     private INodeDirectory processINodeDirectory(final INodeDirectory srcChild
         ) throws IOException {
-      final INodeDirectory dstChild = new INodeDirectory(srcChild);
+      final INodeDirectory dstChild = new INodeDirectory(srcChild, false);
       dstChild.setChildren(null);
       processRecursively(srcChild, dstChild);
       return dstChild;

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestINodeDirectoryWithSnapshot.java

@@ -220,7 +220,7 @@ public class TestINodeDirectoryWithSnapshot {
     final int i = Diff.search(current, inode);
     Assert.assertTrue(i >= 0);
     final INodeDirectory oldinode = (INodeDirectory)current.get(i);
-    final INodeDirectory newinode = new INodeDirectory(oldinode);
+    final INodeDirectory newinode = new INodeDirectory(oldinode, true);
     newinode.setModificationTime(oldinode.getModificationTime() + 1);
 
     current.set(i, newinode);