From 1705aa90d02432c14f59233d716f0f46af07a935388b151f60cca378b9ce9829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 27 Aug 2024 10:44:21 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main resource-agents revision 7da93417e7afd10e20bb3ecabca9b360 --- ...artial_activation-to-true-in-SLE-HAE.patch | 35 ------ _servicedata | 2 +- drop-deprecated-agents.patch | 29 +++++ portblock.patch | 7 +- resource-agents-4.12.0+git30.7fd7c8fa.tar.xz | 3 - resource-agents-4.14.0+git15.c784b83c.tar.xz | 3 + resource-agents-deprecate-INET6.patch | 22 ++++ resource-agents.changes | 106 ++++++++++++++++++ resource-agents.spec | 38 ++++--- 9 files changed, 189 insertions(+), 56 deletions(-) delete mode 100644 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch create mode 100644 drop-deprecated-agents.patch delete mode 100644 resource-agents-4.12.0+git30.7fd7c8fa.tar.xz create mode 100644 resource-agents-4.14.0+git15.c784b83c.tar.xz create mode 100644 resource-agents-deprecate-INET6.patch diff --git a/0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch b/0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch deleted file mode 100644 index f49f407..0000000 --- a/0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f55ef2a4297f1d2003424cce55a39017f8481ca3 Mon Sep 17 00:00:00 2001 -From: Diego Akechi -Date: Wed, 14 Aug 2019 11:47:03 +0200 -Subject: [PATCH] LVM: Default partial_activation to true in SLE HAE - ---- - heartbeat/LVM | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/heartbeat/LVM b/heartbeat/LVM -index 287856e5..65a94b36 100755 ---- a/heartbeat/LVM -+++ b/heartbeat/LVM -@@ -34,7 +34,8 @@ - OCF_RESKEY_volgrpname_default="" - OCF_RESKEY_exclusive_default="false" - OCF_RESKEY_tag_default="pacemaker" --OCF_RESKEY_partial_activation_default="false" -+# True by default in SLE HAE -+OCF_RESKEY_partial_activation_default="true" - - : ${OCF_RESKEY_volgrpname=${OCF_RESKEY_volgrpname_default}} - : ${OCF_RESKEY_exclusive=${OCF_RESKEY_exclusive_default}} -@@ -109,7 +110,7 @@ If "exclusive" is set on a non clustered volume group, this overrides the tag to - - If set, the volume group will be activated partially even with some - physical volumes missing. It helps to set to true when using mirrored --logical volumes. -+logical volumes. Enabled by default. - - Activate VG partially when missing PVs - --- -2.16.4 - diff --git a/_servicedata b/_servicedata index bb288a1..dab5eae 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/ClusterLabs/resource-agents.git -b02b06c437b1d8cb1dcfe8ace47c2efc4a0e476c +34e51ac4a554a103f70c9ecb69b65236b7c8615d \ No newline at end of file diff --git a/drop-deprecated-agents.patch b/drop-deprecated-agents.patch new file mode 100644 index 0000000..5ffd6f4 --- /dev/null +++ b/drop-deprecated-agents.patch @@ -0,0 +1,29 @@ +--- a/heartbeat/Makefile.am 2024-06-07 07:19:37.336355067 +0200 ++++ b/heartbeat/Makefile.am 2024-06-07 08:43:49.674399158 +0200 +@@ -60,10 +60,8 @@ ocf_SCRIPTS = AoEtarget \ + Evmsd \ + Filesystem \ + ICP \ +- IPaddr \ + IPaddr2 \ + IPsrcaddr \ +- LVM \ + LinuxSCSI \ + lvmlockd \ + LVM-activate \ +@@ -137,7 +135,6 @@ ocf_SCRIPTS = AoEtarget \ + minio \ + mysql \ + mysql-proxy \ +- nagios \ + named \ + nfsnotify \ + nfsserver \ +@@ -166,7 +163,6 @@ ocf_SCRIPTS = AoEtarget \ + rabbitmq-cluster \ + rabbitmq-server-ha \ + redis \ +- rkt \ + rsyncd \ + rsyslog \ + scsi2reservation \ diff --git a/portblock.patch b/portblock.patch index 1722b38..e07a4b9 100644 --- a/portblock.patch +++ b/portblock.patch @@ -1,10 +1,9 @@ ---- heartbeat/portblock.orig 2022-01-19 15:27:39.056294933 +0100 -+++ heartbeat/portblock 2022-01-19 17:43:18.986060453 +0100 -@@ -299,7 +299,8 @@ +--- heartbeat/portblock.orig 2024-06-07 08:35:56.538587042 +0200 ++++ heartbeat/portblock 2024-06-07 08:36:36.086905689 +0200 +@@ -328,6 +328,8 @@ save_tcp_connections() tickle_remote() { [ -z "$OCF_RESKEY_tickle_dir" ] && return -- echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle + [ -f "/proc/sys/net/ipv4/tcp_tw_recycle" ] && echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle + [ -f "/proc/sys/net/ipv4/tcp_tw_reuse" ] && echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse f=$OCF_RESKEY_tickle_dir/$OCF_RESKEY_ip diff --git a/resource-agents-4.12.0+git30.7fd7c8fa.tar.xz b/resource-agents-4.12.0+git30.7fd7c8fa.tar.xz deleted file mode 100644 index b0a0c3c..0000000 --- a/resource-agents-4.12.0+git30.7fd7c8fa.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7f1d9e894ed1ce09590e76296bcd65b906fa498017081475519bfd3c10ff2de -size 616656 diff --git a/resource-agents-4.14.0+git15.c784b83c.tar.xz b/resource-agents-4.14.0+git15.c784b83c.tar.xz new file mode 100644 index 0000000..6426794 --- /dev/null +++ b/resource-agents-4.14.0+git15.c784b83c.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6b9e6d650bc8df4c142197cbe27faea0eb885a4f2a41e7bb677b7dd0eeeecdc +size 625592 diff --git a/resource-agents-deprecate-INET6.patch b/resource-agents-deprecate-INET6.patch new file mode 100644 index 0000000..98901f0 --- /dev/null +++ b/resource-agents-deprecate-INET6.patch @@ -0,0 +1,22 @@ +Index: resource-agents-4.13.0+git6.ae50f94f/ldirectord/ldirectord.in +=================================================================== +--- resource-agents-4.13.0+git6.ae50f94f.orig/ldirectord/ldirectord.in ++++ resource-agents-4.13.0+git6.ae50f94f/ldirectord/ldirectord.in +@@ -3264,7 +3264,7 @@ sub check_ldap + sub check_nntp + { + use IO::Socket; +- use IO::Socket::INET6; ++ use IO::Socket::IP; + use IO::Select; + my ($v, $r) = @_; + my $sock; +@@ -3275,7 +3275,7 @@ sub check_nntp + + &ld_debug(2, "Checking NNTP server=$$r{server} port=$port"); + +- unless ($sock = IO::Socket::INET6->new(PeerAddr => $$r{server}, ++ unless ($sock = IO::Socket::IP->new(PeerAddr => $$r{server}, + PeerPort => $port, Proto => 'tcp', + TimeOut => $$v{negotiatetimeout})) { + service_set($v, $r, "down", {do_log => 1}); diff --git a/resource-agents.changes b/resource-agents.changes index 5d3f33a..82ed96f 100644 --- a/resource-agents.changes +++ b/resource-agents.changes @@ -1,3 +1,109 @@ +------------------------------------------------------------------- +Fri Jun 07 05:18:24 UTC 2024 - varkoly@suse.com + +- Update to version 4.14.0+git15.c784b83c: + * ocf-shellfuncs: fix version regex in ocf_local_nodename() + * azure-events-az: update to API versions, add retry functionality for metadata requests, update tests + * Mid: storage-mon: Add logging to daemon mode. + * outscale: new resource agent (#1938) + * Azure-lb fails if IPv6 disabled (#1939) + * Filesystem: fail when leading or trailing whitespace is present in device or directory parameters + * AWS agents: use curl_retry() + * Filesystem: fail when incorrect device mounted on mountpoint, and dont unmount the mountpoint in this case, or if mountpoint set to "/" + * ocf-shellfuncs: add curl_retry() + * build: update ChangeLog for 4.14.0 + * doc: writing-python-agents: add description of is_probe() and distro() + * build: update ChangeLog for 4.14.0-rc1 + * db2: fix OCF_SUCESS name in db2_notify (#1933) + * docs: writing-python-agents: update required Python version to 3.6+ + * findif.sh: fix corner cases + * portblock: remove write to tcp_tw_recycle +- Normalize log format from RAs with one of Pacemaker (bsc#1217456) +- Remove unsupported RAs from resource-agents package (jsc#PED-5577) (jsc#PED-8232) + add-patch: + drop-deprecated-agents.patch + remove-patch: + 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch + +------------------------------------------------------------------- +Fri Apr 05 13:53:33 UTC 2024 - varkoly@suse.com + +- Update to version 4.13.0+git41.828c175c: + * Fix: openstack-info: Ensure no newlines in openstack_ports + * nfsserver: fix "server scope" functionality for both potentially other dropins AND multiple ExecStart + * all agents: remove -S state/status that are either ignored, or give an error message in newer versions of Pacemaker + * portblock: accept numeric protocol from iptables + * spec: use /usr/sbin paths for Fedora 40+ + * Support IPv6 with Azure load balncer. Using the "TCP6-LISTENER" causes socat to listen in a dual-stack manner (bsc#1220997) + * Doc: Delay: Drop old comments + * Fix docker RA behavior when Docker isn't running + * galera: allow joiner to report non-Primary during initial IST + +------------------------------------------------------------------- +Tue Mar 12 12:29:53 UTC 2024 - pgajdos@suse.com + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang_path macro, [bsc#1212476] + +------------------------------------------------------------------- +Fri Feb 16 10:20:11 UTC 2024 - varkoly@suse.com + +- Update to version 4.13.0+git23.fa8a56f6: + * Don't build with -ansi by default + * Filesystem: add reference to wait manpage to comment + * Avoid false positive for VG activation + * configure: fix "C preprocessor "gcc -E" fails sanity check" error caused by autoconf 2.72 + * Low: IPaddr2: Remove stray backslash + * storage_mon: use memset() to fix "uninitialized value" covscan error, as qb_ipcc_recv() will always set a message (according to honzaf) + * findif: also check that netmaskbits != EOS + * storage_mon: fix file handler out of scope leak and uninitialized values + * aws-vpc-move-ip/aws-vpc-route53/awseip/awsvip: add auth_type parameter and AWS Policy based authentication type + +------------------------------------------------------------------- +Mon Jan 15 12:08:57 UTC 2024 - Pedro Monreal + +- Remove the deprecated perl-IO-Socket-INET6 dependency + * Remove the dependency on perl(IO::Socket::INET6) as it has been + deprecated by upstream, is no longer suitable for use and its not + being maintained. A compatible replacement for this package is + perl(IO::Socket::IP) which is shipped by the perl-base package. + * Add resource-agents-deprecate-INET6.patch + +------------------------------------------------------------------- +Tue Nov 14 18:56:26 UTC 2023 - varkoly@suse.com + +- Update to version 4.13.0+git6.ae50f94f: + * findif.sh: fix loopback handling + * exportfs: remove test for "fsid=" parameter + * Fix PRIMARY_IFACE variable. In some cases ip returns two lines + * build: update ChangeLog for 4.13.0 + * README: update IRC info to link to ClusterLabs wiki IRC page + * findif.sh: dont use table parameter as it returns no netmask (tested with main/local/custom tables) + * build: update ChangeLog for 4.13.0-rc1 + * iSCSI: add support for scst + * Low: storage-mon: Remove unnecessary code and fix typos. + * mysql-common: improve error message (#1887) + * Mid: storage-mon RA: Changed OCF_RESKEY_daemonize_default and OCF_RESKEY_daemonize default and judgment part. + * postfix: Update permission check from su to runuser/su (#1880) + * Mid: storage-mon: Retry failed attrd_updater. + * Mid: storage-mon: Added daemon/client mode. + * Mid: storage-mon: Functionalization of test_device call processing. + +------------------------------------------------------------------- +Tue Jul 25 09:22:06 UTC 2023 - varkoly@suse.com + +- Update to version 4.12.0+git50.5c26404e: + * Filesystem: fix incorrect variable name for signal_delay default in metadata + * Delay: remove statement about defaulting to "startdelay" value if not specified + * Filesystem: dont use boolean type for non-boolean parameters + * Filesystem: list_mounts: fix mount command output parsing + * Delay: increase stop, status and monitor timeouts to 40s to avoid failing with default values + * Filesystem: improve stop-action and allow setting term/kill signals and signal_delay for large filesystems + * findif.sh: fix table parameter so it uses main table by default + * mysql: fix promotion_score bouncing between ~3600 and 1 on demoted nodes + * spec: Migrate to SPDX license + * Filesystem: create systemd drop-in for network filesystems + ------------------------------------------------------------------- Mon May 01 12:24:36 UTC 2023 - varkoly@suse.com diff --git a/resource-agents.spec b/resource-agents.spec index 2acfcb9..4a38b9f 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -1,7 +1,7 @@ # # spec file for package resource-agents # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: resource-agents -Version: 4.12.0+git30.7fd7c8fa +Version: 4.14.0+git15.c784b83c Release: 0 Summary: HA Reusable Cluster Resource Scripts License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later @@ -26,27 +26,32 @@ URL: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz Source1: monitoring-plugins-metadata.tar.bz2 -# PATCH-FIX-OPENSUSE: activate VG with partial PV by default -Patch1: 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch +Patch1: drop-deprecated-agents.patch # PATCH-FIX-OPENSUSE: fix path to sm-notify Patch2: 0002-nfsserver-fix-path-to-sm-notify.patch # PATCH-FIX-OPENSUSE: ldirectord: don't create subsys lock Patch3: 0003-ldirectord-don-t-create-subsys-lock.patch # PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch +%if 0%{?suse_version} < 1600 # PATCH-FIX-OPENSUSE: Revert ocf_log: use same log format at pacemaker Patch6: 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch +%endif # PATCH-FIX-OPENSUSE: Patch7: 0007-Request-to-add-gcp-vpc-move-route.patch Patch8: nfsnotify.patch Patch9: portblock.patch +# PATCH-FIX-OPENSUSE: Remove deprecated perl-IO-Socket-INET6 dependency +Patch10: resource-agents-deprecate-INET6.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: cluster-glue-devel BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 +BuildRequires: libqb-devel BuildRequires: libxslt BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros @@ -80,7 +85,7 @@ Group: Productivity/Clustering/HA Requires: %{name} Requires: ipvsadm Requires: logrotate -Requires: perl-IO-Socket-INET6 +Requires: perl-IO-Socket-IP Requires: perl-MailTools Requires: perl-Net-SSLeay Requires: perl-Socket6 @@ -120,14 +125,17 @@ pages of individual nagios plugins. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p0 -%patch8 -p0 -%patch9 -p0 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%if 0%{?suse_version} < 1600 +%patch -P 6 -p1 +%endif +%patch -P 7 -p0 +%patch -P 8 -p0 +%patch -P 9 -p0 +%patch -P 10 -p1 %build autoreconf -fvi @@ -178,6 +186,10 @@ cd %{buildroot}%{_prefix}/lib/ocf/resource.d/suse ln -s %{_prefix}/lib/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip ) +%if %{suse_version} >= 1600 +%python3_fix_shebang_path %{buildroot}%{_prefix}/lib/ocf/resource.d/heartbeat/* +%endif + %post %service_add_post resource-agents-deps.target %tmpfiles_create %_tmpfilesdir/resource-agents.conf