From 764dd8b19f5700931bd0f3ab9d43e6435ac56f2d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 05 2019 15:37:15 +0000 Subject: import fence-agents-4.2.1-30.el8_1.1 --- diff --git a/SOURCES/bz1762432-fence_compute-disable-service-after-force-down.patch b/SOURCES/bz1762432-fence_compute-disable-service-after-force-down.patch new file mode 100644 index 0000000..a8161d1 --- /dev/null +++ b/SOURCES/bz1762432-fence_compute-disable-service-after-force-down.patch @@ -0,0 +1,42 @@ +From 099758a41bbb153c4a13a89de57cdcb72e1f1ea7 Mon Sep 17 00:00:00 2001 +From: Michele Baldessari +Date: Fri, 11 Oct 2019 10:39:53 +0200 +Subject: [PATCH] fence_compute: Invert the force-down/service disable order + +In OpenStack Train we first observed that IHA was not working via +https://bugzilla.redhat.com/show_bug.cgi?id=1760213 + +The reason for this is that nova has made the disabling of the compute +service depend on the compute node being up via: +https://review.opendev.org/#/c/654596/ + +By first calling force-down, the subsequence service-disable API +call won't wait for the reachability of the compute node any +longer and the whole operation has the same outcome. + +Tested this on an OSP Train environment and we correctly +got Instance HA working again and we observed the VMs being +restarted on the available compute nodes. + +Co-Authored-By: Luca Miccini +--- + agents/compute/fence_compute.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agents/compute/fence_compute.py b/agents/compute/fence_compute.py +index a94bdc46..c08a9dbe 100644 +--- a/agents/compute/fence_compute.py ++++ b/agents/compute/fence_compute.py +@@ -117,11 +117,11 @@ def set_power_status_off(connection, options): + if status in [ "off" ]: + return + +- connection.services.disable(options["--plug"], 'nova-compute') + try: + # Until 2.53 + connection.services.force_down( + options["--plug"], "nova-compute", force_down=True) ++ connection.services.disable(options["--plug"], 'nova-compute') + except Exception as e: + # Something went wrong when we tried to force the host down. + # That could come from either an incompatible API version diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index a5fba32..cc08638 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -29,7 +29,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.2.1 -Release: 30%{?alphatag:.%{alphatag}}%{?dist} +Release: 30%{?alphatag:.%{alphatag}}%{?dist}.1 License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -77,6 +77,7 @@ Patch35: bz1714458-fence_scsi-node-id-new-format.patch Patch36: bz1720198-fence_scsi-watchdog-fix-retry-failing-on-first-try.patch Patch37: bz1732773-fence_vmware_rest-fix-keyerror-suspended-vms.patch Patch38: bz1748443-fence_zvmip-python3-fixes.patch +Patch39: bz1762432-fence_compute-disable-service-after-force-down.patch %if 0%{?fedora} || 0%{?rhel} > 7 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan mpath kdump redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti @@ -193,6 +194,7 @@ BuildRequires: python3-google-api-client %patch36 -p1 -F1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -952,6 +954,10 @@ Fence agent for IBM z/VM over IP. %endif %changelog +* Thu Oct 17 2019 Oyvind Albrigtsen - 4.2.1-30.1 +- fence_compute: disable service after force-down + Resolves: rhbz#1762432 + * Fri Sep 6 2019 Oyvind Albrigtsen - 4.2.1-30 - fence_zvmip: fix Python 3 issues Resolves: rhbz#1748443