Skip to content

[crmsh-4.6] Dev: ui_cluster: Hint the watchdog option should be used with sbd option #1948

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

Draft
wants to merge 2 commits into
base: crmsh-4.6
Choose a base branch
from
Draft

[crmsh-4.6] Dev: ui_cluster: Hint the watchdog option should be used with sbd option #1948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098c05c
Dev: ui_cluster: Hint the watchdog option should be used with sbd option
liangxin1300 Oct 21, 2025
b10cfc7
Dev: behave: Adjust functional test for previous commit
liangxin1300 Oct 21, 2025
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
3 changes: 3 additions & 0 deletions crmsh/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ def _validate_sbd_option(self):
"""
Validate sbd options
"""
no_sbd_option = not self.sbd_devices and not self.diskless_sbd
if self.watchdog and no_sbd_option:
utils.fatal("-w option should be used with -s or -S option")
if self.sbd_devices and self.diskless_sbd:
utils.fatal("Can't use -s and -S options together")
if self.stage == "sbd":
Expand Down
2 changes: 1 addition & 1 deletion crmsh/ui_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ def do_init(self, context, *args):
parser.add_argument("-S", "--enable-sbd", dest="diskless_sbd", action="store_true",
help="Enable SBD even if no SBD device is configured (diskless mode)")
parser.add_argument("-w", "--watchdog", dest="watchdog", metavar="WATCHDOG",
help="Use the given watchdog device or driver name")
help="Use the given watchdog device or driver name (only valid together with -s or -S option)")
parser.add_argument("-x", "--skip-csync2-sync", dest="skip_csync2", action="store_true",
help="Skip csync2 initialization (an experimental option)")
parser.add_argument("--no-overwrite-sshkey", action="store_true", dest="no_overwrite_sshkey",
Expand Down
3 changes: 2 additions & 1 deletion test/features/steps/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
-S, --enable-sbd Enable SBD even if no SBD device is configured
(diskless mode)
-w WATCHDOG, --watchdog WATCHDOG
Use the given watchdog device or driver name
Use the given watchdog device or driver name (only
valid together with -s or -S option)
-x, --skip-csync2-sync
Skip csync2 initialization (an experimental option)
--no-overwrite-sshkey
Expand Down