remove redundant if-statement, update assert

apache · Jan 12, 2022 · 3e738af · 3e738af
1 parent af3ad91
commit 3e738af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/...fs-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/...dfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeReconfiguration.java b/...dfs/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));
     }
   }