Skip to content

HDFS-16609. Fix Flakes Junit Tests that often report timeouts. #4382

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
Hexiaoqiao merged 5 commits into from
Jun 11, 2022
Merged

HDFS-16609. Fix Flakes Junit Tests that often report timeouts. #4382

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6f1e82
HDFS-16609. Fix Flakes Junit Tests that often report timeouts.
May 30, 2022
5eab597
Merge branch 'apache:trunk' into HDFS-16609
slfan1989 Jun 7, 2022
2d11420
HDFS-16609. Fix Comment.
Jun 7, 2022
20fe8be
Merge branch 'apache:trunk' into HDFS-16609
slfan1989 Jun 9, 2022
4e70daf
Merge branch 'apache:trunk' into HDFS-16609
slfan1989 Jun 10, 2022
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
2 changes: 1 addition & 1 deletion hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ private void confirmOwner(String owner, String group,
}
}

@Test (timeout = 30000)
@Test (timeout = 60000)
public void testFilePermissions() throws IOException {
Configuration conf = new HdfsConfiguration();

Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public void testServerDefaultsWithMinimalCaching() throws Exception {
defaults.getDefaultStoragePolicyId());
doReturn(newDefaults).when(spyNamesystem).getServerDefaults();

// Verify that the value is updated correctly. Wait for 3 seconds.
// Verify that the value is updated correctly. Wait for 6 seconds.
GenericTestUtils.waitFor(()->{
try {
FsServerDefaults currDef = dfsClient.getServerDefaults();
Expand All @@ -282,7 +282,7 @@ public void testServerDefaultsWithMinimalCaching() throws Exception {
// do nothing;
return false;
}
}, 1, 3000);
}, 1, 6000);
Copy link
Contributor

@tomscut tomscut Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment Wait for 3 seconds above also needs to be changed.

Copy link
Contributor Author

@slfan1989 slfan1989 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your help review, I will fix it.


} finally {
cluster.shutdown();
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@ public void testSPSWhenFileHasLowRedundancyBlocks() throws Exception {
* 4. Set policy and call satisfyStoragePolicy for file.
* 5. Block should be moved successfully.
*/
@Test(timeout = 300000)
@Test(timeout = 600000)
public void testSPSWhenFileHasExcessRedundancyBlocks() throws Exception {
try {
config.set(DFSConfigKeys
Expand Down