rpms
/
resource-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import resource-agents-4.1.1-96.el8

This commit is contained in:
CentOS Sources 2021-06-16 04:23:09 +00:00 committed by Andrew Lukoshko
parent 4a650e019b
commit c2790b9f16
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
SOURCES/bz1972035-LVM-activate-fix-drop-in.patch Normal file
View File

@ -0,0 +1,39 @@
From 5729c79c6ab06f3dacf1fe8dafab9403e5560e34 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 20 May 2021 10:14:49 +0200
Subject: [PATCH] LVM-activate: fix drop-in check to avoid re-creating drop-in
file when it already exists
---
heartbeat/LVM-activate | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/heartbeat/LVM-activate b/heartbeat/LVM-activate
index a8e40dce4..53223367e 100755
--- a/heartbeat/LVM-activate
+++ b/heartbeat/LVM-activate
@@ -820,17 +820,14 @@ lvm_start() {
if systemd_is_running ; then
# Create drop-in to deactivate VG before stopping
# storage services during shutdown/reboot.
- after=$(systemctl show resource-agents-deps.target.d \
- --property=After | cut -d'=' -f2)
-
- case "$after" in
- *" blk-availability.service "*)
- ;;
- *)
- systemd_drop_in "99-LVM-activate" "After" \
+ systemctl show resource-agents-deps.target \
+ --property=After | cut -d'=' -f2 | \
+ grep -qE "(^|\s)blk-availability.service(\s|$)"
+
+ if [ "$?" -ne 0 ]; then
+ systemd_drop_in "99-LVM-activate" "After" \
"blk-availability.service"
- ;;
- esac
+ fi
# If blk-availability isn't started, the "After="
# directive has no effect.

9
SPECS/resource-agents.spec
View File

@ -70,7 +70,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.1.1
Release: 95%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 96%{?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}
@ -280,6 +280,7 @@ Patch188: bz1934651-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch
Patch189: bz1872754-pgsqlms-new-ra.patch
Patch190: bz1957765-gcp-vpc-move-vip-retry.patch
Patch191: bz1969968-lvmlockd-remove-with_cmirrord.patch
Patch192: bz1972035-LVM-activate-fix-drop-in.patch
# bundle patches
Patch1000: 7-gcp-bundled.patch
@ -644,6 +645,7 @@ exit 1
%patch189 -p1
%patch190 -p1
%patch191 -p1
%patch192 -p1
chmod 755 heartbeat/nova-compute-wait
chmod 755 heartbeat/NovaEvacuate
@ -1225,6 +1227,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Tue Jun 15 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-96
- LVM-activate: fix drop-in check to avoid re-creating drop-in
Resolves: rhbz#1972035
* Fri Jun 11 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-95
- lvmlockd: remove cmirrord support, as cmirrord is incompatible w/lvmlockd