From 5566f944d422fe4cbeb5872e5cbd323ee35e59ad Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 03 2020 08:11:40 +0000 Subject: import resource-agents-4.1.1-80.el8 --- diff --git a/SOURCES/bz1901357-crypt-1-support-symlink-devices.patch b/SOURCES/bz1901357-crypt-1-support-symlink-devices.patch new file mode 100644 index 0000000..6b4f385 --- /dev/null +++ b/SOURCES/bz1901357-crypt-1-support-symlink-devices.patch @@ -0,0 +1,23 @@ +From 4ded33d34505af19ddf19bfa125b5e6c243ebd94 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 26 Nov 2020 12:56:03 +0100 +Subject: [PATCH] crypt: allow encrypted_dev to be symlink to support using + devices in /dev/disk/... or UUID + +--- + heartbeat/crypt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/crypt b/heartbeat/crypt +index 7d0a5607c..3ca28b92d 100755 +--- a/heartbeat/crypt ++++ b/heartbeat/crypt +@@ -177,7 +177,7 @@ crypt_validate_all() { + esac + esac + fi +- if [ ! -b "$encrypted_dev" ]; then ++ if [ ! -b "$encrypted_dev" ] && [ ! -L "$encrypted_dev" ]; then + ocf_exit_reason "Encrypted device $encrypted_dev not accessible" + return $OCF_ERR_ARGS + fi diff --git a/SOURCES/bz1901357-crypt-2-dont-sanity-check-during-probe.patch b/SOURCES/bz1901357-crypt-2-dont-sanity-check-during-probe.patch new file mode 100644 index 0000000..4e259d4 --- /dev/null +++ b/SOURCES/bz1901357-crypt-2-dont-sanity-check-during-probe.patch @@ -0,0 +1,44 @@ +From 6a45c28cd074e14a7bc2e2531b15595b9985965c Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 1 Dec 2020 10:11:52 +0100 +Subject: [PATCH] crypt: avoid failing for LVM exclusive by not running full + sanity check during probes + +--- + heartbeat/crypt | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/crypt b/heartbeat/crypt +index 3ca28b92d..05bded7c5 100755 +--- a/heartbeat/crypt ++++ b/heartbeat/crypt +@@ -177,6 +177,13 @@ crypt_validate_all() { + esac + esac + fi ++ ++ # return early for probes where device might not be available yet ++ # e.g. LVM exclusive volumes ++ if ocf_is_probe; then ++ return $OCF_SUCCESS ++ fi ++ + if [ ! -b "$encrypted_dev" ] && [ ! -L "$encrypted_dev" ]; then + ocf_exit_reason "Encrypted device $encrypted_dev not accessible" + return $OCF_ERR_ARGS +@@ -294,11 +301,13 @@ crypt_stop() { + crypt_monitor() { + cryptsetup status $crypt_dev $disable_locks >/dev/null 2>&1 + if [ $? -eq 0 ]; then +- [ -L $crypt_dev_path ] && return $OCF_SUCCESS ++ if [ -b "$encrypted_dev" ] || [ -L $crypt_dev_path ]; then ++ return $OCF_SUCCESS ++ fi + return $OCF_ERR_GENERIC + fi + +- [ "$__OCF_ACTION" = "monitor" ] && ! ocf_is_probe && ocf_exit_reason "Crypt resource not running" ++ [ "$__OCF_ACTION" = "monitor" ] && ! ocf_is_probe && ocf_exit_reason "Crypt resource not running" + return $OCF_NOT_RUNNING + } + diff --git a/SOURCES/bz1901357-crypt-support-symlink-devices.patch b/SOURCES/bz1901357-crypt-support-symlink-devices.patch deleted file mode 100644 index 6b4f385..0000000 --- a/SOURCES/bz1901357-crypt-support-symlink-devices.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4ded33d34505af19ddf19bfa125b5e6c243ebd94 Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Thu, 26 Nov 2020 12:56:03 +0100 -Subject: [PATCH] crypt: allow encrypted_dev to be symlink to support using - devices in /dev/disk/... or UUID - ---- - heartbeat/crypt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/heartbeat/crypt b/heartbeat/crypt -index 7d0a5607c..3ca28b92d 100755 ---- a/heartbeat/crypt -+++ b/heartbeat/crypt -@@ -177,7 +177,7 @@ crypt_validate_all() { - esac - esac - fi -- if [ ! -b "$encrypted_dev" ]; then -+ if [ ! -b "$encrypted_dev" ] && [ ! -L "$encrypted_dev" ]; then - ocf_exit_reason "Encrypted device $encrypted_dev not accessible" - return $OCF_ERR_ARGS - fi diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 1ca9a61..6311628 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -70,7 +70,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.1.1 -Release: 79%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 80%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -258,8 +258,9 @@ Patch166: bz1886262-podman-recover-from-killed-conmon.patch Patch167: bz1900015-podman-recover-from-storage-out-of-sync.patch Patch168: bz1898690-crypt-make-key_file-crypt_type_not-unique.patch Patch169: bz1899551-NovaEvacuate-fix-delay_evacuate-unset.patch -Patch170: bz1901357-crypt-support-symlink-devices.patch +Patch170: bz1901357-crypt-1-support-symlink-devices.patch Patch171: bz1902208-LVM-activate-stop-before-storage-service.patch +Patch172: bz1901357-crypt-2-dont-sanity-check-during-probe.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -587,6 +588,7 @@ exit 1 %patch169 -p1 -F2 %patch170 -p1 %patch171 -p1 +%patch172 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -1150,17 +1152,17 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Tue Dec 1 2020 Oyvind Albrigtsen - 4.1.1-80 +- crypt: support symlink devices, and dont run sanity checks for probes + + Resolves: rhbz#1901357 + * Mon Nov 30 2020 Oyvind Albrigtsen - 4.1.1-79 - LVM-activate: add drop-in during start-action to avoid getting fenced during reboot Resolves: rhbz#1902208 -* Thu Nov 26 2020 Oyvind Albrigtsen - 4.1.1-78 -- crypt: support symlink devices - - Resolves: rhbz#1901357 - * Wed Nov 25 2020 Oyvind Albrigtsen - 4.1.1-77 - NovaEvacuate: set delay_evacuate to 0 when it's not set