Skip to content

Revert "HDFS-16458. [SPS]: Fix bug for unit test of reconfiguring SPS mode" #4038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ferhui merged 1 commit into from
Feb 28, 2022
Merged

Revert "HDFS-16458. [SPS]: Fix bug for unit test of reconfiguring SPS mode" #4038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...op-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeReconfigure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/**
Expand All @@ -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();
Expand All @@ -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,
Expand Down