From b2f541a7492a61f4dcc28982a2ac6dec32d49e31 Mon Sep 17 00:00:00 2001 From: Hui Fei Date: Mon, 28 Feb 2022 21:05:19 +0800 Subject: [PATCH] Revert "[SPS]: Fix bug for unit test of reconfiguring SPS mode (#3998)" (#4038) --- .../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 33debdb149..fe555532cb 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 void testReconfigureStoragePolicySatisfierEnabled() 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 void testSatisfyStoragePolicyAfterSatisfierDisabled() 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 @@ void verifySPSEnabled(final NameNode nameNode, String property, .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,