This is an automated email from the ASF dual-hosted git repository. ferhui pushed a commit to branch revert-3998-HDFS-16458 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 5b875befa316970085b9bee7f9f27cd7761cc7e9 Author: Hui Fei <[email protected]> AuthorDate: Mon Feb 28 21:04:44 2022 +0800 Revert "[SPS]: Fix bug for unit test of reconfiguring SPS mode (#3998)" This reverts commit 8aa568cea5050f60dd7fbc69b60c78657da032e8. --- .../apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java index 33debdb..fe55553 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java @@ -307,8 +307,6 @@ public class TestNameNodeReconfigure { StoragePolicySatisfierMode.EXTERNAL.toString(), nameNode.getConf().get(DFS_STORAGE_POLICY_SATISFIER_MODE_KEY, DFS_STORAGE_POLICY_SATISFIER_MODE_DEFAULT)); - assertNotNull("SPS Manager should be created", - nameNode.getNamesystem().getBlockManager().getSPSManager()); } /** @@ -324,8 +322,6 @@ public class TestNameNodeReconfigure { StoragePolicySatisfierMode.NONE.toString()); verifySPSEnabled(nameNode, DFS_STORAGE_POLICY_SATISFIER_MODE_KEY, StoragePolicySatisfierMode.NONE, false); - assertNull("SPS Manager should be null", - nameNode.getNamesystem().getBlockManager().getSPSManager()); Path filePath = new Path("/testSPS"); DistributedFileSystem fileSystem = cluster.getFileSystem(); @@ -349,7 +345,7 @@ public class TestNameNodeReconfigure { .getNamesystem().getBlockManager().getSPSManager(); boolean isSPSRunning = spsMgr != null ? spsMgr.isSatisfierRunning() : false; - assertEquals(property + " has wrong value", isSatisfierRunning, isSPSRunning); + assertEquals(property + " has wrong value", isSPSRunning, isSPSRunning); String actual = nameNode.getConf().get(property, DFS_STORAGE_POLICY_SATISFIER_MODE_DEFAULT); assertEquals(property + " has wrong value", expected, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
