From 23c45ee55a1150ac368ac496cc84810b30f7f215 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 13 Nov 2021 20:01:03 +0800 Subject: [PATCH 1/4] fixinvalidconfig --- .../TestAvailableSpaceRackFaultTolerantBPP.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java index 4d249c8ef67cd..b23923e1f47d6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java @@ -40,6 +40,7 @@ import java.util.Collections; import java.util.HashSet; +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AVAILABLE_SPACE_BLOCK_PLACEMENT_POLICY_BALANCED_SPACE_PREFERENCE_FRACTION_DEFAULT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -65,7 +66,7 @@ public class TestAvailableSpaceRackFaultTolerantBPP { public static void setupCluster() throws Exception { conf = new HdfsConfiguration(); conf.setFloat( - DFSConfigKeys.DFS_NAMENODE_AVAILABLE_SPACE_BLOCK_PLACEMENT_POLICY_BALANCED_SPACE_PREFERENCE_FRACTION_KEY, + DFSConfigKeys.DFS_NAMENODE_AVAILABLE_SPACE_RACK_FAULT_TOLERANT_BLOCK_PLACEMENT_POLICY_BALANCED_SPACE_PREFERENCE_FRACTION_KEY, 0.6f); String[] racks = new String[NUM_RACKS]; for (int i = 0; i < NUM_RACKS; i++) { @@ -189,6 +190,13 @@ public void testChooseDataNode() { } } + @Test + public void testDefaultConfigValue() { + Assert.assertEquals( + conf.get("DFS_NAMENODE_AVAILABLE_SPACE_RACK_FAULT_TOLERANT_BLOCK_PLACEMENT_POLICY_BALANCED_SPACE_PREFERENCE_FRACTION_KEY") + ,0.6f); + } + /** * Test if the nodes are all spread across all racks. */ From d501c0eedd035371849a94e5cc899d71cbd27a61 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 13 Nov 2021 20:07:39 +0800 Subject: [PATCH 2/4] fixinvalidconfig --- .../blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java index b23923e1f47d6..b09bc2d54b2de 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java @@ -40,7 +40,6 @@ import java.util.Collections; import java.util.HashSet; -import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AVAILABLE_SPACE_BLOCK_PLACEMENT_POLICY_BALANCED_SPACE_PREFERENCE_FRACTION_DEFAULT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; From b881916cd6f2e399d5a6cfc7230aaa83ff973a9a Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 13 Nov 2021 21:57:14 +0800 Subject: [PATCH 3/4] fixinvalidconfig --- .../TestAvailableSpaceRackFaultTolerantBPP.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java index b09bc2d54b2de..7acf132be75eb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceRackFaultTolerantBPP.java @@ -189,13 +189,6 @@ public void testChooseDataNode() { } } - @Test - public void testDefaultConfigValue() { - Assert.assertEquals( - conf.get("DFS_NAMENODE_AVAILABLE_SPACE_RACK_FAULT_TOLERANT_BLOCK_PLACEMENT_POLICY_BALANCED_SPACE_PREFERENCE_FRACTION_KEY") - ,0.6f); - } - /** * Test if the nodes are all spread across all racks. */ From dcc21b479d735ebf5f8c4a07b4e6f6156d026f9f Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sun, 14 Nov 2021 09:57:34 +0800 Subject: [PATCH 4/4] triggerrebuild