big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[SPS]: Fix bug for unit test of reconfiguring SPS mode (#3998)" (#4038)

Browse Source
This commit is contained in:
Hui Fei 2022-02-28 21:05:19 +08:00 committed by GitHub
parent 8aa568cea5
commit b2f541a749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java
View File

@ -307,8 +307,6 @@ public void testReconfigureStoragePolicySatisfierEnabled()
StoragePolicySatisfierMode.EXTERNAL.toString(), StoragePolicySatisfierMode.EXTERNAL.toString(),
nameNode.getConf().get(DFS_STORAGE_POLICY_SATISFIER_MODE_KEY, nameNode.getConf().get(DFS_STORAGE_POLICY_SATISFIER_MODE_KEY,
DFS_STORAGE_POLICY_SATISFIER_MODE_DEFAULT)); 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()); StoragePolicySatisfierMode.NONE.toString());
verifySPSEnabled(nameNode, DFS_STORAGE_POLICY_SATISFIER_MODE_KEY, verifySPSEnabled(nameNode, DFS_STORAGE_POLICY_SATISFIER_MODE_KEY,
StoragePolicySatisfierMode.NONE, false); StoragePolicySatisfierMode.NONE, false);
assertNull("SPS Manager should be null",
nameNode.getNamesystem().getBlockManager().getSPSManager());
Path filePath = new Path("/testSPS"); Path filePath = new Path("/testSPS");
DistributedFileSystem fileSystem = cluster.getFileSystem(); DistributedFileSystem fileSystem = cluster.getFileSystem();
@ -349,7 +345,7 @@ void verifySPSEnabled(final NameNode nameNode, String property,
.getNamesystem().getBlockManager().getSPSManager(); .getNamesystem().getBlockManager().getSPSManager();
boolean isSPSRunning = spsMgr != null ? spsMgr.isSatisfierRunning() boolean isSPSRunning = spsMgr != null ? spsMgr.isSatisfierRunning()
: false; : false;
assertEquals(property + " has wrong value", isSatisfierRunning, isSPSRunning); assertEquals(property + " has wrong value", isSPSRunning, isSPSRunning);
String actual = nameNode.getConf().get(property, String actual = nameNode.getConf().get(property,
DFS_STORAGE_POLICY_SATISFIER_MODE_DEFAULT); DFS_STORAGE_POLICY_SATISFIER_MODE_DEFAULT);
assertEquals(property + " has wrong value", expected, assertEquals(property + " has wrong value", expected,