From 3e738afea78fa6738b0de6767a65521a213263fb Mon Sep 17 00:00:00 2001 From: tom lee Date: Wed, 12 Jan 2022 09:47:55 +0800 Subject: [PATCH] remove redundant if-statement, update assert --- .../hadoop/hdfs/server/datanode/DataNode.java | 15 +++++---------- .../datanode/TestDataNodeReconfiguration.java | 5 +++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 3c2a271395f18..5e35b334553c7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -664,16 +664,11 @@ private String reconfDataXceiverParameters(String property, String newVal) String result; try { LOG.info("Reconfiguring {} to {}", property, newVal); - if (property.equals(DFS_DATANODE_MAX_RECEIVER_THREADS_KEY)) { - Preconditions.checkNotNull(getXferServer(), "DataXceiverServer has not been initialized."); - int threads = (newVal == null ? DFS_DATANODE_MAX_RECEIVER_THREADS_DEFAULT : - Integer.parseInt(newVal)); - result = Integer.toString(threads); - getXferServer().setMaxXceiverCount(threads); - } else { - throw new IllegalArgumentException("Unexpected property " + property + - " in reconfDataXceiverParameters"); - } + Preconditions.checkNotNull(getXferServer(), "DataXceiverServer has not been initialized."); + int threads = (newVal == null ? DFS_DATANODE_MAX_RECEIVER_THREADS_DEFAULT : + Integer.parseInt(newVal)); + result = Integer.toString(threads); + getXferServer().setMaxXceiverCount(threads); LOG.info("RECONFIGURE* changed {} to {}", property, newVal); return result; } catch (IllegalArgumentException e) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeReconfiguration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeReconfiguration.java index b94ac70d8d19f..881722b263906 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeReconfiguration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeReconfiguration.java @@ -25,6 +25,7 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_DEFAULT; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -400,8 +401,8 @@ public void testDataXceiverReconfiguration() assertEquals(String.format("%s has wrong value", DFS_DATANODE_MAX_RECEIVER_THREADS_KEY), DFS_DATANODE_MAX_RECEIVER_THREADS_DEFAULT, dn.getXferServer().getMaxXceiverCount()); - assertEquals(String.format("expect %s is not configured", - DFS_DATANODE_MAX_RECEIVER_THREADS_KEY), null, + assertNull(String.format("expect %s is not configured", + DFS_DATANODE_MAX_RECEIVER_THREADS_KEY), dn.getConf().get(DFS_DATANODE_MAX_RECEIVER_THREADS_KEY)); } }