Skip to content

HDDS-16135. Fix remaining intermittent failures in TestKeyLifecycleService #11202

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

Open
shuan1026 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

HDDS-16135. Fix remaining intermittent failures in TestKeyLifecycleService #11202

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
12 changes: 9 additions & 3 deletions ...one-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyLifecycleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,14 @@ void testScanStatePiggybackedOnDelete(BucketLayout bucketLayout, boolean createP

// Verify that scan state was updated through the DeleteKeysRequest
String bucketKey = metadataManager.getBucketKey(volumeName, bucketName);
OmLifecycleScanState scanState = metadataManager.getLifecycleScanStateTable().get(bucketKey);
assertNotNull(scanState);
assertNotNull(scanState.getScanEndTime());
GenericTestUtils.waitFor(() -> {
try {
OmLifecycleScanState scanState = metadataManager.getLifecycleScanStateTable().get(bucketKey);
return scanState != null && scanState.getScanEndTime() != null;
} catch (IOException e) {
return false;
}
}, WAIT_CHECK_INTERVAL, 10000);

deleteLifecyclePolicy(volumeName, bucketName);
}
Expand Down Expand Up @@ -2594,6 +2599,7 @@ void testMultipleDirectoriesMatched(String keyPrefix1, String keyPrefix2, String
LOG.info("Dir {} refreshes its modification time", dirName);
KeyInfoWithVolumeContext keyInfo2 = getDirectory(volumeName, bucketName, dirName);
assertNotEquals(keyInfo.getKeyInfo().getModificationTime(), keyInfo2.getKeyInfo().getModificationTime());
awaitDirCacheDrained(volumeName, bucketName);
}

// resume KeyLifecycleService bucket scan
Expand Down