From 23fc0a072e1de2421ae06cd8e90ad924afcbb70a Mon Sep 17 00:00:00 2001 From: tom lee Date: Fri, 15 Oct 2021 00:02:47 +0800 Subject: [PATCH 1/2] HDFS-16274. Improve log for FSNamesystem#startFileInt --- .../apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 1fb6238c39baa..7ad90ac1a93ca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -2722,11 +2722,10 @@ private HdfsFileStatus startFileInt(String src, iip = FSDirWriteFileOp.resolvePathForStartFile( dir, pc, src, flag, createParent); - if (blockSize < minBlockSize) { - throw new IOException("Specified block size is less than configured" + - " minimum value (" + DFSConfigKeys.DFS_NAMENODE_MIN_BLOCK_SIZE_KEY - + "): " + blockSize + " < " + minBlockSize); + throw new IOException("Specified block size " + blockSize + + " is less than configured minimum value " + + DFSConfigKeys.DFS_NAMENODE_MIN_BLOCK_SIZE_KEY + "=" + minBlockSize); } if (shouldReplicate) { From 921142829c1b1438909953b99464550125817995 Mon Sep 17 00:00:00 2001 From: tom lee Date: Fri, 15 Oct 2021 09:21:42 +0800 Subject: [PATCH 2/2] fix failed unit test --- .../apache/hadoop/hdfs/server/namenode/TestFileLimit.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java index 636dc6059f166..d5a04c8e4ffe5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java @@ -210,8 +210,9 @@ public void testMinBlockSizeLimit() throws Exception { assert false : "Expected IOException after creating a file with small" + " blocks "; } catch (IOException e) { - GenericTestUtils.assertExceptionContains("Specified block size is less", - e); + GenericTestUtils.assertExceptionContains( + "is less than configured minimum value " + + "dfs.namenode.fs-limits.min-block-size=", e); } } finally { cluster.shutdown();