pacemaker/bug-995365_pacemaker-cts-restart-systemd-journald.patch

21 lines
1.1 KiB
Diff
Raw Normal View History

Accepting request 1187166 from home:yan_gao:branches:network:ha-clustering:Factory - Update to version 2.1.7+20240711.239cba384: - various: Don't set cluster-layer node ID as XML ID - tools: crm_node -i must initialize nodeid before passing pointer (gh#ClusterLabs/pacemaker#3574) - Update to version 2.1.7+20240709.f04c3b02c: - tools: CIB clients retry signon upon an EAGAIN error (gh#ClusterLabs/pacemaker#3567, bsc#1224183) - libcib: new function cib__signon_attempts() (gh#ClusterLabs/pacemaker#3567, bsc#1224183) - Update to version 2.1.7+20240708.347e83d87: - crm_verify: Improve checking of fencing level IDs - Update to version 2.1.7+20240703.f73f033d5 (Pacemaker-2.1.8-rc3): - sysconfig: deprecate PCMK_dh_min_bits environment variable - Update to version 2.1.7+20240701.8af8b59e2: - libcrmcluster: use local hostname for node name if not configured in corosync (gh#ClusterLabs/pacemaker#3551) - Update to version 2.1.7+20240701.b4e61209c: - tools: Don't double-free XML in crm_verify after schema update - Update to version 2.1.7+20240701.a1003bbf1: - cts-cli: update expected output for crm_verify to distinguish configuration warnings and errors (gh#ClusterLabs/pacemaker#3543) - tools: crm_verify distinguishes configuration warnings and errors (gh#ClusterLabs/pacemaker#3543) - Update to version 2.1.7+20240624.5d44a760b: - libcrmcommon: don't try to add to full string in pcmk__time_format_hr() - libcrmcommon: handle formatting errors in pcmk__time_format_hr() - scheduler: consider group locations when member is explicit colocation dependent - tools: Don't skip formatting if running crm_simulate interactively. OBS-URL: https://build.opensuse.org/request/show/1187166 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=401
2024-07-12 14:14:17 +00:00
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: