SHA256
1
0
forked from pool/pacemaker
pacemaker/bug-995365_pacemaker-cts-restart-systemd-journald.patch
Yan Gao 3d429d5100 Accepting request 1093808 from home:yan_gao:branches:network:ha-clustering:Factory
- rpm: build with --with-sbd-sync-default="true" only for sle_version >= 150400 (bsc#1180966)
- rpm: build with --enable-legacy-links only for suse_version < 1600
- rpm: build with --enable-compat-2.0 only for suse_version < 1600 (jsc#PED-106, jsc#PED-294)
- rpm: build with --with-concurrent-fencing-default=true only for sle_version >= 150400
- rpm: build with --with-resource-stickiness-default=1 only for sle_version >= 150400
- rpm: build with --with-nagios=true only for suse_version < 1600 (jsc#PED-3877, jsc#PED-4446)
- agents: create symlink ocf:pacemaker:NodeUtilization only for suse_version < 1600 in favor of ocf💓NodeUtilization (bsc#1070347)

- Update to version 2.1.6+20230524.6fdc9deea (Pacemaker-2.1.6):
- scheduler: ensure earlier group member starts happen after later member stops

- Update to version 2.1.5+20230502.802a72226 (Pacemaker-2.1.6-rc2):
- rpm: avoid bare wildcards under shared directories in spec
- scheduler: consider mandatory colocations before optional

- Update to version 2.1.5+20230501.832463d94:
- daemons: pacemakerd -S should wait for shutdown before returning (bsc#1210857)

- Update to version 2.1.5+20230501.b049bbeea:
- scheduler: deprecate support for Nagios resources (jsc#PED-3877, jsc#PED-4446)
- scheduler: deprecate "moon" in date_spec elements in rules
- daemons: Preserve transient attrs when possible
- daemons: Sync remote connection info with new controllers.
- daemons: Record the node hosting a remote connection resource.
- daemons: Add node hosting connection resource to state XML.
- daemons: Broadcast remote node state changes to all controllers
- daemons: Add daemon uptime to execd XML replies.

- Update to version 2.1.5+20230424.6127934e3:
- fencer: fencing timeout sent to peer takes no delay into account (bsc#1210074)

OBS-URL: https://build.opensuse.org/request/show/1093808
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=383
2023-06-19 17:24:46 +00:00

21 lines
1.1 KiB
Diff

Index: pacemaker-2.1.5+20230505.f342042ae/cts/lab/CTSaudits.py
===================================================================
--- pacemaker-2.1.5+20230505.f342042ae.orig/cts/lab/CTSaudits.py
+++ pacemaker-2.1.5+20230505.f342042ae/cts/lab/CTSaudits.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: