From 42151805661102b3a0890a9f1e193d91d2790fac Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Mon, 14 Nov 2022 14:52:47 -0600 Subject: [PATCH] Low: tools: quote timestamp in operation history output --- cts/cli/regression.tools.exp | 22 +++++++++++----------- lib/pengine/pe_output.c | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp index 51fdbac1ce5..badbc699621 100644 --- a/cts/cli/regression.tools.exp +++ b/cts/cli/regression.tools.exp @@ -4605,17 +4605,17 @@ Resources colocated with gr2: =#=#=#= End test: Show resource digests with overrides - OK (0) =#=#=#= * Passed: crm_resource - Show resource digests with overrides =#=#=#= Begin test: Show resource operations =#=#=#= -rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_0 (node=node4, call=136, rc=7, last-rc-change=Sun Nov 22 21:22:53 2020, exec=28ms): complete -Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node4, call=5, rc=7, last-rc-change=Sun Nov 22 21:17:07 2020, exec=2ms): complete -rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_0 (node=node2, call=101, rc=7, last-rc-change=Sun Nov 22 21:22:53 2020, exec=45ms): complete -Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node2, call=5, rc=7, last-rc-change=Sun Nov 22 21:17:07 2020, exec=4ms): complete -Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node3, call=5, rc=7, last-rc-change=Sun Nov 22 21:17:07 2020, exec=24ms): complete -rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_0 (node=node5, call=99, rc=193, last-rc-change=Sun Nov 22 21:22:53 2020, exec=27ms): pending -Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node5, call=5, rc=7, last-rc-change=Sun Nov 22 21:17:07 2020, exec=14ms): complete -rsc1 (ocf:pacemaker:Dummy): Started: rsc1_start_0 (node=node1, call=104, rc=0, last-rc-change=Sun Nov 22 21:45:16 2020, exec=22ms): complete -rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_10000 (node=node1, call=106, rc=0, last-rc-change=Sun Nov 22 21:45:16 2020, exec=20ms): complete -Fencing (stonith:fence_xvm): Started: Fencing_start_0 (node=node1, call=10, rc=0, last-rc-change=Sun Nov 22 21:17:07 2020, exec=59ms): complete -Fencing (stonith:fence_xvm): Started: Fencing_monitor_120000 (node=node1, call=12, rc=0, last-rc-change=Sun Nov 22 21:17:07 2020, exec=70ms): complete +rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_0 (node=node4, call=136, rc=7, exec=28ms): complete +Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node4, call=5, rc=7, exec=2ms): complete +rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_0 (node=node2, call=101, rc=7, exec=45ms): complete +Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node2, call=5, rc=7, exec=4ms): complete +Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node3, call=5, rc=7, exec=24ms): complete +rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_0 (node=node5, call=99, rc=193, exec=27ms): pending +Fencing (stonith:fence_xvm): Started: Fencing_monitor_0 (node=node5, call=5, rc=7, exec=14ms): complete +rsc1 (ocf:pacemaker:Dummy): Started: rsc1_start_0 (node=node1, call=104, rc=0, exec=22ms): complete +rsc1 (ocf:pacemaker:Dummy): Started: rsc1_monitor_10000 (node=node1, call=106, rc=0, exec=20ms): complete +Fencing (stonith:fence_xvm): Started: Fencing_start_0 (node=node1, call=10, rc=0, exec=59ms): complete +Fencing (stonith:fence_xvm): Started: Fencing_monitor_120000 (node=node1, call=12, rc=0, exec=70ms): complete =#=#=#= End test: Show resource operations - OK (0) =#=#=#= * Passed: crm_resource - Show resource operations =#=#=#= Begin test: Show resource operations (XML) =#=#=#= diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c index 62c2e03b905..6a911a54815 100644 --- a/lib/pengine/pe_output.c +++ b/lib/pengine/pe_output.c @@ -1909,7 +1909,7 @@ node_and_op(pcmk__output_t *out, va_list args) { if (crm_element_value_epoch(xml_op, XML_RSC_OP_LAST_CHANGE, &last_change) == pcmk_ok) { - last_change_str = crm_strdup_printf(", %s=%s, exec=%sms", + last_change_str = crm_strdup_printf(", %s='%s', exec=%sms", XML_RSC_OP_LAST_CHANGE, pcmk__trim(ctime(&last_change)), crm_element_value(xml_op, XML_RSC_OP_T_EXEC));