Skip to content
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

NAS-130256 / 24.10 / Avoid deadlocking during DS health initialization #14087

Merged
merged 1 commit into from
Jul 25, 2024
Merged

NAS-130256 / 24.10 / Avoid deadlocking during DS health initialization #14087

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
8 changes: 8 additions & 0 deletions src/middlewared/middlewared/plugins/directoryservices_/health.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ def check(self) -> bool:
if initial_status in (DSStatus.LEAVING, DSStatus.JOINING):
self.logger.debug("Deferring health check due to status of %s", initial_status.name)
return True
elif initial_status is None:
# Our directory service hasn't been initialized.
#
# We'll be optimistic and call it HEALTHY before we run the
# the actual health checks below. The reason for this is so that
# if we attempt to etc.generate files during health check a
# second call to directoryservices.status won't land us here again.
DSHealthObj.update(enabled_ds, DSStatus.HEALTHY, None)

try:
match enabled_ds:
Expand Down
Loading