pacemaker/bug-995365_pacemaker-cts-restart-systemd-journald.patch
Yan Gao 48db58056e Accepting request 1131354 from home:yan_gao:branches:network:ha-clustering:Factory
- Update to version 2.1.6+20231205.0f6fbd59f:
- scheduler: log reason for recheck time updates
- scheduler: update recheck time for node-pending-timeout

- Update to version 2.1.6+20231204.e1a1bd808:
- tools: Fix a regression in tool XML output. (clbz#5529)

- Update to version 2.1.6+20231122.7534cc50a (Pacemaker-2.1.7-rc2):
- rpm: require minimum libxml2 version of 2.6.0
- libcrmcommon: Write crm_verify detailed messages to XML
- libcrmcommon: Use const for xmlCtxtGetLastError() (CLBZ#5530)
- libcrmcommon: Drop deprecated libxml2 symbols (CLBZ#5530)
- sysconfig: Use CRM_DAEMON_USER and CRM_DAEMON_GROUP
- sysconfig: Fix defaults for dh_min_bits/dh_max_bits
- sysconfig: Document PCMK_stderr
- pacemakerd: Mark PCMK_shutdown_delay as deprecated
- sysconfig: Document PCMK_cluster_type
- sysconfig: Document PCMK_remote_pid1
- sysconfig: Document PCMK_node_action_limit
- sysconfig: Mark PCMK_cib_timeout as deprecated
- controld/schedullerd: Change the default value of node-pending-timeout to 0.
- controld: Adding default value for node-pending-timeout.
- crm_resource: make --wait wait for pending actions in CIB

- Update to version 2.1.6+20231031.d0ef74d64 (Pacemaker-2.1.7-rc1):
- attrd: revert faulty T138 fix
- controller: bail if CIB modify fails within transaction
- scheduler: don't show pending nodes as having "<3.15.1" feature set

- Update to version 2.1.6+20231030.66cc0f083:

OBS-URL: https://build.opensuse.org/request/show/1131354
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=385
2023-12-06 12:30:32 +00:00

21 lines
1.1 KiB
Diff

Index: pacemaker-2.1.6+20231030.66cc0f083/python/pacemaker/_cts/audits.py
===================================================================
--- pacemaker-2.1.6+20231030.66cc0f083.orig/python/pacemaker/_cts/audits.py
+++ pacemaker-2.1.6+20231030.66cc0f083/python/pacemaker/_cts/audits.py
@@ -80,13 +80,9 @@ class LogAudit(ClusterAudit):
for node in nodes:
if self._cm.env["have_systemd"]:
- (rc, _) = self._cm.rsh(node, "systemctl stop systemd-journald.socket")
+ (rc, _) = self._cm.rsh(node, "systemctl restart systemd-journald.socket")
if rc != 0:
- self._cm.log("ERROR: Cannot stop 'systemd-journald' on %s" % node)
-
- (rc, _) = self._cm.rsh(node, "systemctl start systemd-journald.service")
- if rc != 0:
- self._cm.log("ERROR: Cannot start 'systemd-journald' on %s" % node)
+ self._cm.log("ERROR: Cannot restart 'systemd-journald' on %s" % node)
(rc, _) = self._cm.rsh(node, "service %s restart" % self._cm.env["syslogd"])
if rc != 0: