Dev: ui_sbd: Configure crashdump watchdog timeout #1732
Merged
Conversation
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
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
from
d1be2d5 to
d0edb67
Compare
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
10 times, most recently
from
f377478 to
e3f1f86
Compare
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
from
e3f1f86 to
e218c75
Compare
nicholasyang2022
previously approved these changes
Apr 11, 2025
crmsh/cibquery.py
Outdated
| )) | ||
|
|
||
|
|
||
| def has_primitive(cib: lxml.etree.Element, ra: ResourceAgent) -> list[str]: |
There was a problem hiding this comment.
has_primitive sounds like to return a boolean.
Suggested change
| def has_primitive(cib: lxml.etree.Element, ra: ResourceAgent) -> list[str]: | |
| def get_primitives_with_ra(cib: lxml.etree.Element, ra: ResourceAgent) -> list[str]: |
crmsh/cibquery.py
Outdated
Comment on lines
43
to
45
| return [e.get('id') for e in cib.xpath( | ||
| f'/cib/configuration/resources//primitive[@class="{ra.m_class}"{provider_condition} and @type="{ra.m_type}"]' | ||
| )] |
There was a problem hiding this comment.
Suggested change
| return [e.get('id') for e in cib.xpath( | |
| f'/cib/configuration/resources//primitive[@class="{ra.m_class}"{provider_condition} and @type="{ra.m_type}"]' | |
| )] | |
| return cib.xpath( | |
| f'/cib/configuration/resources//primitive[@class="{ra.m_class}"{provider_condition} and @type="{ra.m_type}"]/@id', | |
| ) |
crmsh/cibquery.py
Outdated
Comment on lines
50
to
53
| e.get('value') for e in cib.xpath( | ||
| f'/cib/configuration/resources//primitive[@id="{res_id}"]' | ||
| f'/instance_attributes/nvpair[@name="{param_name}"]' | ||
| ) |
There was a problem hiding this comment.
Can use .../@value in xpath.
crmsh/ui_sbd.py
Outdated
| PARSE_RE = re.compile( | ||
| # Match keys with non-empty values, capturing possible suffix | ||
| r'(\w+)(?:-(\w+))?=("[^"]+"|[\w/\d;]+)' | ||
| r'([\w-]+)-([\w-]+)=([\w/\d]+)' |
There was a problem hiding this comment.
Comment and code disagree here.
There was a problem hiding this comment.
Update as
PARSE_RE = re.compile(
# To extract key, suffix and value from these possible arguments:
# watchdog-timeout=30
# crashdump-watchdog-timeout=120
# watchdog-device=/dev/watchdog
r'([\w-]+)-([\w]+)=([\w/]+)'
)And added the unit test for it
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
8 times, most recently
from
be8789d to
187d48c
Compare
This commit supports configuring the crashdump watchdog timeout by using `crm sbd configure crashdump-watchdog-timeout=<timeout>`, for both disk-based and diskless SBD.
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
from
187d48c to
48e37ad
Compare
when configuring crashdump option.
Skip the process of configuring if the value is the same. Also load all attributes of SBD UI class before running any sbd subcommand, to ensure all attributes are updated.
When no crashdump watchdog timeout configured, return False; When crashdump watchdog timeout was specified and not equal to previous value, return True; Or, when watchdog timeout was specified and not equal to previous value, return True.
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
11 times, most recently
from
40f10f4 to
afb7d99
Compare
To cleanup crashdump option from fence_sbd agent and related configurations in /etc/sysconfig/sbd
liangxin1300
force-pushed
the
20250328_crashdump_option
branch
from
afb7d99 to
964c262
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR supports configuring the crashdump watchdog timeout
by using
crm sbd configure crashdump-watchdog-timeout=<timeout>,for both disk-based and diskless SBD.