Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9155. OEV should treat .XML files as XML even when the file name extension is uppercase (nijel via cmccabe) 

(cherry picked from commit 2fc2b50534)
This commit is contained in:
Colin Patrick Mccabe 2015-10-05 12:53:58 -07:00
parent a509413c9a
commit 05b88080b6
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -668,6 +668,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8979. Clean up checkstyle warnings in hadoop-hdfs-client module. HDFS-8979. Clean up checkstyle warnings in hadoop-hdfs-client module.
(Mingliang Liu via wheat9) (Mingliang Liu via wheat9)
HDFS-9155. OEV should treat .XML files as XML even when the file name
extension is uppercase (nijel via cmccabe)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/OfflineEditsViewer.java
View File

@ -136,7 +136,7 @@ public class OfflineEditsViewer extends Configured implements Tool {
visitor = OfflineEditsVisitorFactory.getEditsVisitor( visitor = OfflineEditsVisitorFactory.getEditsVisitor(
outputFileName, processor, flags.getPrintToScreen()); outputFileName, processor, flags.getPrintToScreen());
} }
boolean xmlInput = inputFileName.endsWith(".xml"); boolean xmlInput = inputFileName.toLowerCase().endsWith(".xml");
OfflineEditsLoader loader = OfflineEditsLoaderFactory. OfflineEditsLoader loader = OfflineEditsLoaderFactory.
createLoader(visitor, inputFileName, xmlInput, flags); createLoader(visitor, inputFileName, xmlInput, flags);
loader.loadEdits(); loader.loadEdits();

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/TestOfflineEditsViewer.java
View File

@ -100,10 +100,17 @@ public class TestOfflineEditsViewer {
LOG.info("Generated edits=" + edits); LOG.info("Generated edits=" + edits);
String editsParsedXml = folder.newFile("editsParsed.xml").getAbsolutePath(); String editsParsedXml = folder.newFile("editsParsed.xml").getAbsolutePath();
String editsReparsed = folder.newFile("editsParsed").getAbsolutePath(); String editsReparsed = folder.newFile("editsParsed").getAbsolutePath();
// capital case extension
String editsParsedXML_caseInSensitive =
folder.newFile("editsRecoveredParsed.XML").getAbsolutePath();
// parse to XML then back to binary // parse to XML then back to binary
assertEquals(0, runOev(edits, editsParsedXml, "xml", false)); assertEquals(0, runOev(edits, editsParsedXml, "xml", false));
assertEquals(0, runOev(edits, editsParsedXML_caseInSensitive, "xml", false));
assertEquals(0, runOev(editsParsedXml, editsReparsed, "binary", false)); assertEquals(0, runOev(editsParsedXml, editsReparsed, "binary", false));
assertEquals(0,
runOev(editsParsedXML_caseInSensitive, editsReparsed, "binary", false));
// judgment time // judgment time
assertTrue("Edits " + edits + " should have all op codes", assertTrue("Edits " + edits + " should have all op codes",
@ -115,6 +122,7 @@ public class TestOfflineEditsViewer {
filesEqualIgnoreTrailingZeros(edits, editsReparsed)); filesEqualIgnoreTrailingZeros(edits, editsReparsed));
} }
@Test @Test
public void testRecoveryMode() throws IOException { public void testRecoveryMode() throws IOException {
// edits generated by nnHelper (MiniDFSCluster), should have all op codes // edits generated by nnHelper (MiniDFSCluster), should have all op codes