big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-12828. OIV ReverseXML Processor fails with escaped characters

Browse Source 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Erik Krogen 2018-04-18 14:38:23 +09:00 committed by Akira Ajisaka
parent bcb57b1f89
commit 2d9e791a90
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
View File

@ -385,8 +385,8 @@ private void loadNodeChildrenHelper(Node parent, String expected,
break; break;
case XMLEvent.CHARACTERS: case XMLEvent.CHARACTERS:
String val = XMLUtils. String val = XMLUtils.
unmangleXmlString(ev.asCharacters().getData(), true); unmangleXmlString(ev.asCharacters().getData(), false);
parent.setVal(val); parent.setVal(parent.getVal() + val);
events.nextEvent(); events.nextEvent();
break; break;
case XMLEvent.ATTRIBUTE: case XMLEvent.ATTRIBUTE:

7
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
View File

@ -194,10 +194,15 @@ public static void createOriginalFSImage() throws IOException {
dirCount++; dirCount++;
writtenFiles.put(emptydir.toString(), hdfs.getFileStatus(emptydir)); writtenFiles.put(emptydir.toString(), hdfs.getFileStatus(emptydir));
//Create a directory whose name should be escaped in XML //Create directories whose name should be escaped in XML
Path invalidXMLDir = new Path("/dirContainingInvalidXMLChar\u0000here"); Path invalidXMLDir = new Path("/dirContainingInvalidXMLChar\u0000here");
hdfs.mkdirs(invalidXMLDir); hdfs.mkdirs(invalidXMLDir);
dirCount++; dirCount++;
Path entityRefXMLDir = new Path("/dirContainingEntityRef&here");
hdfs.mkdirs(entityRefXMLDir);
dirCount++;
writtenFiles.put(entityRefXMLDir.toString(),
hdfs.getFileStatus(entityRefXMLDir));
//Create a directory with sticky bits //Create a directory with sticky bits
Path stickyBitDir = new Path("/stickyBit"); Path stickyBitDir = new Path("/stickyBit");