Add assertions for rename within the snapshot directory.

szetszwo · szetszwo · commit 30ab7c879440 · 2023-06-14T10:29:24.000+08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestRenameWithSnapshots.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestRenameWithSnapshots.java
@@ -197,6 +197,7 @@ public void testRenameFileNotInSnapshot() throws Exception {
     assertTrue(existsInDiffReport(entries, DiffType.MODIFY, "", null));
     assertTrue(existsInDiffReport(entries, DiffType.CREATE, file2.getName(),
         null));
+    restartClusterAndCheckImage(true);
   }
 
   /**
@@ -219,6 +220,7 @@ public void testRenameFileInSnapshot() throws Exception {
     assertTrue(existsInDiffReport(entries, DiffType.MODIFY, "", null));
     assertTrue(existsInDiffReport(entries, DiffType.RENAME, file1.getName(),
         file2.getName()));
+    restartClusterAndCheckImage(true);
   }
 
   @Test (timeout=60000)

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ public void testRenameFileNotInSnapshot() throws Exception {`
`197`	`197`	`assertTrue(existsInDiffReport(entries, DiffType.MODIFY, "", null));`
`198`	`198`	`assertTrue(existsInDiffReport(entries, DiffType.CREATE, file2.getName(),`
`199`	`199`	`null));`
	`200`	`+ restartClusterAndCheckImage(true);`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`/**`
`@@ -219,6 +220,7 @@ public void testRenameFileInSnapshot() throws Exception {`
`219`	`220`	`assertTrue(existsInDiffReport(entries, DiffType.MODIFY, "", null));`
`220`	`221`	`assertTrue(existsInDiffReport(entries, DiffType.RENAME, file1.getName(),`
`221`	`222`	`file2.getName()));`
	`223`	`+ restartClusterAndCheckImage(true);`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`@Test (timeout=60000)`