HDDS-16131. Intermittent failure in TestBlockDeletingService#testBlockDeletionMetricsUpdatedProperlyAfterEachExecution

[echonesis]

What changes were proposed in this pull request?

This patch ensures that BlockDeletingServiceTestImpl is shut down in a finally block. Service shutdown waits for the deletion tasks to finish and release their container DB references before test cleanup runs.

The same lifecycle handling is also added to testChecksumFileUpdatedWhenDeleteRetried, which starts the service without shutting it down and is susceptible to the same teardown race.

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-16131

How was this patch tested?

Local Test

mvn -pl :hdds-container-service test \
    -Dtest='TestBlockDeletingService#testBlockDeletionMetricsUpdatedProperlyAfterEachExecution+testChecksumFileUpdatedWhenDeleteRetried' \
    -DskipShade -DskipRecon -DskipDocs

GitHub Actions CI

• build-branch: https://github.com/echonesis/ozone/actions/runs/31658338732
• flaky-test-check: https://github.com/echonesis/ozone/actions/runs/31658570932

[ss77892]

Overall it looks good. One small thing. It would be better to move service shutdown in @AfterEach. That would prevent this problem in future tests (if someone miss the shutdown)

[echonesis]

Overall it looks good. One small thing. It would be better to move service shutdown in @AfterEach. That would prevent this problem in future tests (if someone miss the shutdown)

Thanks for the suggestion.
I moved the service shutdown to @AfterEach and registered the service when it is created by the test helper. This ensures the asynchronous deletion tasks finish before the container cache is cleaned up, including when a test fails or a future test misses an explicit shutdown.

[rich7420]

nit: reset this to null in init(). It is never cleared, so a test that runs after a service-creating one without creating its own will re-shutdown() the prior (already-terminated) instance in cleanup. Harmless since shutdown() is idempotent, but resetting drops the cross-test coupling.

[rich7420]

@echonesis thanks for the patch!