fix snapshot scenarios

Author: huangzhaobo99

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

@@ -82,11 +82,11 @@ private static Triple<Boolean, Optional<QuotaCounts>, Optional<QuotaCounts>> ver
       return Triple.of(false, srcDelta, dstDelta);
     }
 
-    // Verify srcPath and dstPath without valid 'DirectoryWithQuotaFeature'
-    // Note: In overwrite scenarios, quota calculation is still required because:
-    // Overwrite operations delete existing content (affecting rootDir's quota)
-    if (!overwrite && FSDirectory.verifyPathWithoutValidQuotaFeature(src)
-        && FSDirectory.verifyPathWithoutValidQuotaFeature(dst)) {
+    // Verify path without valid 'DirectoryWithQuotaFeature'
+    // Note: In overwrite scenarios, quota calculation is still required, 
+    // overwrite operations delete existing content, which affects the root directory's quota.
+    if (!overwrite && FSDirectory.verifyPathWithoutValidFeature(src)
+        && FSDirectory.verifyPathWithoutValidFeature(dst)) {
       return Triple.of(false, srcDelta, dstDelta);
     }
 
@@ -722,8 +722,8 @@ private static class RenameOperation {
       } else {
         withCount = null;
       }
-      this.updateQuota = quotaPair.getLeft();
       // Set quota for src and dst, ignore src is in Snapshot or is Reference
+      this.updateQuota = quotaPair.getLeft() || isSrcInSnapshot || srcChildIsReference;
       this.srcSubTreeCount = withCount == null ?
           quotaPair.getMiddle() : Optional.empty();
       this.dstSubTreeCount = quotaPair.getRight();

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

@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
+import org.apache.hadoop.hdfs.server.namenode.snapshot.DirectorySnapshottableFeature;
 import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot;
 import org.apache.hadoop.util.StringUtils;
 
@@ -1244,18 +1245,16 @@ static void verifyQuota(INodesInPath iip, int pos, QuotaCounts deltas,
 
   /**
    * Verifies that the path from the specified position to the root
-   * (excluding the root itself) does not contain any valid quota features.
+   * does not contain any valid features.
    *
    * @param iip the INodesInPath containing all the ancestral INodes.
-   * @return true if no valid quota features are found along the path (root excluded),
-   * false if any directory in the path has an active quota feature.
+   * @return true if no valid features are found along the path,
+   * false if any directory in the path has an active feature.
    */
-  static boolean verifyPathWithoutValidQuotaFeature(INodesInPath iip) {
-    // Exclude the root inode
+  static boolean verifyPathWithoutValidFeature(INodesInPath iip) {
     for (int i = iip.length() - 2; i >= 1; i--) {
-      final DirectoryWithQuotaFeature q =
-          iip.getINode(i).asDirectory().getDirectoryWithQuotaFeature();
-      if (q != null) {
+      INodeDirectory d = iip.getINode(i).asDirectory();
+      if (d.isWithQuota()) {
         return false;
       }
     }

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

@@ -169,7 +169,7 @@ public void testQuotaUsageWhenRenameWithDifferStoragePolicy() throws Exception {
   }
 
   @Test
-  public void testRenameWithoutValidQuotaFeature() throws Exception {
+  public void testRenameWithoutValidFeature() throws Exception {
     final int fileLen = 1024;
     final short replication = 3;
     final Path root = new Path("/testRename");