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

HDFS-14148. HDFS OIV ReverseXML SnapshotSection parser throws exception when there are more than one snapshottable directory (#1274) Contributed by Siyao Meng.

This commit is contained in:
Siyao Meng 2019-08-12 17:26:20 -07:00 committed by Wei-Chiu Chuang
parent 201dc667e9
commit c92b49876a
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1353,10 +1353,12 @@ class OfflineImageReconstructor {
if (sd == null) { if (sd == null) {
break; break;
} }
Long dir = sd.removeChildLong(SNAPSHOT_SECTION_DIR); Long dir;
sd.verifyNoRemainingKeys("<dir>"); while ((dir = sd.removeChildLong(SNAPSHOT_SECTION_DIR)) != null) {
// Add all snapshottable directories, one by one
bld.addSnapshottableDir(dir); bld.addSnapshottableDir(dir);
} }
}
header.verifyNoRemainingKeys("SnapshotSection"); header.verifyNoRemainingKeys("SnapshotSection");
bld.build().writeDelimitedTo(out); bld.build().writeDelimitedTo(out);
int actualNumSnapshots = 0; int actualNumSnapshots = 0;

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

@ -288,6 +288,16 @@ public class TestOfflineImageViewer {
hdfs.truncate(file1, 1); hdfs.truncate(file1, 1);
writtenFiles.put(file1.toString(), hdfs.getFileStatus(file1)); writtenFiles.put(file1.toString(), hdfs.getFileStatus(file1));
// HDFS-14148: Create a second snapshot-enabled directory. This can cause
// TestOfflineImageViewer#testReverseXmlRoundTrip to fail before the patch
final Path snapshotDir2 = new Path("/snapshotDir2");
hdfs.mkdirs(snapshotDir2);
// Simply enable snapshot on it, no need to create one
hdfs.allowSnapshot(snapshotDir2);
dirCount++;
writtenFiles.put(snapshotDir2.toString(),
hdfs.getFileStatus(snapshotDir2));
// Set XAttrs so the fsimage contains XAttr ops // Set XAttrs so the fsimage contains XAttr ops
final Path xattr = new Path("/xattr"); final Path xattr = new Path("/xattr");
hdfs.mkdirs(xattr); hdfs.mkdirs(xattr);