Fix problems of softdog watchdog driver - #2155
Open
liangxin1300 wants to merge 4 commits into
Open
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
liangxin1300
force-pushed
the
20260708_watchdog_issue
branch
from
July 13, 2026 07:23
04391f6 to
20769ca
Compare
liangxin1300
changed the title
liangxin1300
force-pushed
the
20260708_watchdog_issue
branch
from
July 13, 2026 13:33
20769ca to
06e0df9
Compare
liangxin1300
marked this pull request as ready for review
July 13, 2026 14:10
liangxin1300
marked this pull request as draft
July 13, 2026 14:38
liangxin1300
force-pushed
the
20260708_watchdog_issue
branch
2 times, most recently
from
July 25, 2026 12:31
53458db to
f4c7055
Compare
liangxin1300
marked this pull request as ready for review
July 25, 2026 13:14
- When running in sbd stage, load watchdog driver on all nodes - When running in join process, load driver on local node only
- Avoid duplicated query-watchdog parsing - Reuse Watchdog.QUERY_CMD in ui_sbd - Share parser for local and remote checks - Keep <unknown> when configured driver is unloaded - Cover parser behavior with unit tests
- Add public softdog usage warning helper - Reuse query-watchdog parser for detection - Run warning during SBD config checks - Cover warning paths with unit tests
- Remove duplicate verify path - Drop unused first-device helper - Prefer non-softdog query results - Update watchdog unit tests
liangxin1300
force-pushed
the
20260708_watchdog_issue
branch
from
July 31, 2026 02:16
f4c7055 to
18e8d20
Compare
|
|
||
| @staticmethod | ||
| def _load_watchdog_driver(driver): | ||
| def _load_watchdog_driver(driver, join=False): |
Collaborator
There was a problem hiding this comment.
Passing join here couples a low level driver loading util with the cluster-level concept (init vs join). A better approach is to pass node_list here and let the caller decide.
| if sbd_only and not re.search(r"Busy: .*sbd", identity): | ||
| continue | ||
| if driver == "<unknown>": | ||
| configured_driver = cls._get_configured_watchdog_driver() |
Collaborator
There was a problem hiding this comment.
This is incorrect as get_watchdog_info accepts arbitrary out, possibly from a remote node, but _get_configured_watchdog_driver() query the local node for driver information.
Probably we should fix sbd to make it to print the correct driver instead of add workarounds in crmsh.
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
2 participants
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.
Problems:
see:
crm sbd statusshows <unknown> instead of softdog when it's configuredcrm cluster health sbdshould give a warning when using softdog as watchdog driverChanges: