HDDS-15429. Fix updateAndRestart deadlock with BackgroundService.PeriodicalTask#10388
Merged
Conversation
adoroszlai
approved these changes
May 30, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request addresses a potential deadlock when runtime reconfiguration triggers updateAndRestart() on services built on BackgroundService, by ensuring shutdown() is not invoked while holding the service instance monitor (which is also used by BackgroundService.PeriodicalTask).
Changes:
- Avoid calling
shutdown()while holding the service monitor inDirectoryDeletingService.updateAndRestart. - Avoid calling
shutdown()while holding the service monitor inBlockDeletingService.updateAndRestart. - Document the
BackgroundService.shutdown()locking constraint to prevent similar deadlocks in other callers.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java | Reworks updateAndRestart to call shutdown() outside the instance monitor, then reconfigure/restart under synchronization. |
| hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/BackgroundService.java | Adds Javadoc clarifying that calling shutdown() while holding the instance monitor can deadlock with PeriodicalTask. |
| hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/BlockDeletingService.java | Reworks updateAndRestart to call shutdown() outside the instance monitor, then reconfigure/restart under synchronization. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
Thanks @adoroszlai for reviewing this. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Any thread that calls shutdown() also can't hold the monitor lock on BackgroundService instance, in this case updateAndRestart. Otherwise, it can deadlock. This is a follow-up to HDDS-14645.
Context: #10378 (comment)
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-15429
How was this patch tested?