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

HDFS-16832. [SBN READ] Follow-on to HDFS-16732. Fix NPE when check the block location of empty directory (#5099) 

Signed-off-by: Erik Krogen <xkrogen@apache.org>
Reviewed-by: Zengqiang Xu <xuzq_zander@163.com>

(cherry picked from commit dc2fba45fe)
This commit is contained in:
zhengchenyu 2022-11-22 00:26:16 +08:00 committed by Erik Krogen
parent 8ff54dac58
commit 4addf31ef4
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -8747,9 +8747,15 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
private void checkBlockLocationsWhenObserver(LocatedBlocks blocks, String src)
throws ObserverRetryOnActiveException {
for (LocatedBlock b : blocks.getLocatedBlocks()) {
if (b.getLocations() == null || b.getLocations().length == 0) {
throw new ObserverRetryOnActiveException("Zero blocklocations for " + src);
if (blocks == null) {
return;
}
List<LocatedBlock> locatedBlockList = blocks.getLocatedBlocks();
if (locatedBlockList != null) {
for (LocatedBlock b : locatedBlockList) {
if (b.getLocations() == null || b.getLocations().length == 0) {
throw new ObserverRetryOnActiveException("Zero blocklocations for " + src);
}
}
}
}

23
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestObserverNode.java
View File

@ -608,6 +608,29 @@ public class TestObserverNode {
}
}
@Test
public void testSimpleReadEmptyDirOrFile() throws IOException {
// read empty dir
dfs.mkdirs(new Path("/emptyDir"));
assertSentTo(0);
dfs.getClient().listPaths("/", new byte[0], true);
assertSentTo(2);
dfs.getClient().getLocatedFileInfo("/emptyDir", true);
assertSentTo(2);
// read empty file
dfs.create(new Path("/emptyFile"), (short)1);
assertSentTo(0);
dfs.getClient().getLocatedFileInfo("/emptyFile", true);
assertSentTo(2);
dfs.getClient().getBlockLocations("/emptyFile", 0, 1);
assertSentTo(2);
}
private static void assertSentTo(DistributedFileSystem fs, int nnIdx)
throws IOException {
assertTrue("Request was not sent to the expected namenode " + nnIdx,