Revert "[SPS]: Fix bug for unit test of reconfiguring SPS mode (#3998)"
This reverts commit 8aa568cea5050f60dd7fbc69b60c78657da032e8.
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 @@
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 @@
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 @@
.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,
