jojochuang commented on a change in pull request #3926:
URL: https://github.com/apache/hadoop/pull/3926#discussion_r798409486
##########
File path:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
##########
@@ -1174,6 +1174,42 @@ public void testReverseXmlWrongLayoutVersion() throws
Throwable {
}
}
+ /**
+ * Tests that the ReverseXML processor doesn't accept XML files without the
SnapshotDiffSection.
+ */
+ @Test
+ public void testReverseXmlWithoutSnapshotDiffSection() throws Throwable {
+ File imageWSDS = new File(tempDir, "imageWithoutSnapshotDiffSection.xml");
+ PrintWriter writer = new PrintWriter(imageWSDS, "UTF-8");
+ try {
+ writer.println("<?xml version=\"1.0\"?>");
+ writer.println("<fsimage>");
+ writer.println("<version>");
+ writer.println("<layoutVersion>-67</layoutVersion>");
+ writer.println("<onDiskVersion>1</onDiskVersion>");
+
writer.println("<oivRevision>545bbef596c06af1c3c8dca1ce29096a64608478</oivRevision>");
+ writer.println("</version>");
+
writer.println("<FileUnderConstructionSection></FileUnderConstructionSection>");
+ writer.println("<ErasureCodingSection></ErasureCodingSection>");
+
writer.println("<INodeSection><lastInodeId>91488</lastInodeId><numInodes>0</numInodes></INodeSection>");
+
writer.println("<SecretManagerSection><currentId>90</currentId><tokenSequenceNumber>35</tokenSequenceNumber><numDelegationKeys>0</numDelegationKeys><numTokens>0</numTokens></SecretManagerSection>");
+ writer.println("<INodeReferenceSection></INodeReferenceSection>");
+
writer.println("<SnapshotSection><snapshotCounter>0</snapshotCounter><numSnapshots>0</numSnapshots></SnapshotSection>");
+
writer.println("<NameSection><namespaceId>326384987</namespaceId></NameSection>");
+
writer.println("<CacheManagerSection><nextDirectiveId>1</nextDirectiveId><numPools>0</numPools><numDirectives>0</numDirectives></CacheManagerSection>");
+ writer.println("<INodeDirectorySection></INodeDirectorySection>");
+ writer.println("</fsimage>");
+ } finally {
+ writer.close();
+ }
+ try {
+ OfflineImageReconstructor.run(imageWSDS.getAbsolutePath(),
Review comment:
If the code is not patched --> exception, test fail.
If the code is patched --> no exception, test succeed.
Therefore, there's no need to catch the exception and check for message,
because if an exception is thrown, the test has to fail. Whether or not the
exception message matches that string or not. Plus, the message to be matched
will not match any way. ("without SnapshotDiffSection." vs "without including
section(s) SnapshotDiffSection")
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
