This is an automated email from the ASF dual-hosted git repository.
smengcl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1cc6423590f HDDS-16610. Fix flaky
TestKeyDeletingService$Metrics#testLastRunAnd24hMetrics (#11329)
1cc6423590f is described below
commit 1cc6423590fd9734afe332dde26e1623062f9014
Author: Mark Tsai <[email protected]>
AuthorDate: Sat Oct 10 06:54:26 2026 +0800
HDDS-16610. Fix flaky
TestKeyDeletingService$Metrics#testLastRunAnd24hMetrics (#11329)
---
.../org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
index 900d64315f6..533a4a1daff 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
@@ -1368,6 +1368,7 @@ void testLastRunAnd24hMetrics() throws Exception {
// wait for AOS deleted keys to be reclaimed and
// snap2 to be deep cleaned.
directoryDeletingService.runPeriodicalTaskNow();
+ om.awaitDoubleBufferFlush();
keyDeletingService.runPeriodicalTaskNow();
GenericTestUtils.waitFor(() -> getDeletedKeyCount() == 10, 100, 10000);
// Verify last run AOS deletion metrics.
@@ -1386,6 +1387,8 @@ void testLastRunAnd24hMetrics() throws Exception {
// Delete snap1. Which also sets the snap2 to be deep cleaned.
writeClient.deleteSnapshot(volumeName, bucketName, snap1);
+ // SnapshotDeletingService silently skips snap1 until its delete is
flushed, and the 1h interval never retries.
+ om.awaitDoubleBufferFlush();
keyManager.getSnapshotDeletingService().runPeriodicalTaskNow();
// Wait for changes to the snap2 to be flushed.
GenericTestUtils.waitFor(
@@ -1400,6 +1403,7 @@ void testLastRunAnd24hMetrics() throws Exception {
// wait for snap2 to be deep cleaned.
directoryDeletingService.runPeriodicalTaskNow();
+ om.awaitDoubleBufferFlush();
keyDeletingService.runPeriodicalTaskNow();
GenericTestUtils.waitFor(() -> getDeletedKeyCount() == 20, 100, 10000);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
