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

[crmsh-4.6] Fix: report: Show different perspectives of cluster status with multiple 'crm_mon' options (bsc#1204273) #1345

Merged
merged 2 commits into from
Mar 12, 2024
Merged

[crmsh-4.6] Fix: report: Show different perspectives of cluster status with multiple 'crm_mon' options (bsc#1204273) #1345

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
847d81f
Fix: report: Show different perspectives of cluster
liangxin1300 Mar 5, 2024
fab3701
Dev: unitest: Adjust unit test for previous change
liangxin1300 Mar 6, 2024
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
20 changes: 19 additions & 1 deletion crmsh/report/collect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,26 @@ def dump_runtime_state(workdir: str) -> None:
Dump runtime state files
"""
cluster_shell_inst = sh.cluster_shell()

# Dump the output of 'crm_mon' command with multiple options
out = ""
for option, desc in [
("-r1", "inactive resources"),
("-n1", "resources grouped by node"),
("-rf1", "resource fail counts"),
("-rnt1", "resource operation history with timing details"),
]:
cmd = f"crm_mon {option}"
out += f"\n#### Display cluster state and {desc}: {cmd} ####\n"
out += cluster_shell_inst.get_stdout_or_raise_error(cmd)
out += "\n\n"

target_f = os.path.join(workdir, constants.CRM_MON_F)
crmutils.str2file(out, target_f)
logger.debug(f"Dump crm_mon state into {utils.real_path(target_f)}")

# Dump other runtime state files
for cmd, f, desc in [
("crm_mon -1", constants.CRM_MON_F, "cluster state"),
("cibadmin -Ql", constants.CIB_F, "CIB contents"),
("crm_node -p", constants.MEMBERSHIP_F, "members of this partition")
]:
Expand Down
11 changes: 9 additions & 2 deletions test/unittests/test_report_collect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,19 @@ def test_dump_runtime_state(self, mock_run, mock_str2file, mock_debug, mock_get_
]
mock_run_inst = mock.Mock()
mock_run.return_value = mock_run_inst
mock_run_inst.get_stdout_or_raise_error.side_effect = ["crm_mon_data", "cib_data", "crm_node_data"]
mock_run_inst.get_stdout_or_raise_error.side_effect = [
"crm_mon_data_r1",
"crm_mon_data_n1",
"crm_mon_data_rf1",
"crm_mon_data_rnt1",
"cib_data",
"crm_node_data"
]
mock_get_dc.return_value = "node1"
mock_this_node.return_value = "node1"
collect.dump_runtime_state("/opt/workdir")
mock_debug.assert_has_calls([
mock.call(f"Dump cluster state into {constants.CRM_MON_F}"),
mock.call(f"Dump crm_mon state into {constants.CRM_MON_F}"),
mock.call(f"Dump CIB contents into {constants.CIB_F}"),
mock.call(f"Dump members of this partition into {constants.MEMBERSHIP_F}"),
mock.call(f"Current DC is node1; Touch file 'DC' in workdir")
Expand Down
Loading