- mysql: fix replication issues

Resolves: rhbz#2179003

bz2179003-mysql-2-fix-demoted-score-bounce.patch

@@ -0,0 +1,32 @@
+From 34483f8029ea9ab25220cfee71d53adaf5aacaa0 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 14 Jun 2023 14:37:01 +0200
+Subject: [PATCH] mysql: fix promotion_score bouncing between ~3600 and 1 on
+ demoted nodes
+
+---
+ heartbeat/mysql | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/heartbeat/mysql b/heartbeat/mysql
+index 29ed42731..1df2fc0f2 100755
+--- a/heartbeat/mysql
++++ b/heartbeat/mysql
+@@ -517,17 +517,6 @@ check_slave() {
+ 
+                 exit $OCF_ERR_INSTALLED
+             fi
+-        elif ocf_is_ms; then
+-            # Even if we're not set to evict lagging slaves, we can
+-            # still use the seconds behind master value to set our
+-            # master preference.
+-            local master_pref
+-            master_pref=$((${OCF_RESKEY_max_slave_lag}-${secs_behind}))
+-            if [ $master_pref -lt 0 ]; then
+-                # Sanitize a below-zero preference to just zero
+-                master_pref=0
+-            fi
+-            $CRM_MASTER -v $master_pref
+         fi
+ 
+         # is the slave ok to have a VIP on it

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	38%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	39%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -96,12 +96,13 @@ Patch43:	bz2157872-5-pgsqlms-alidate-all-OCF_CHECK_LEVEL-10.patch
 Patch44:	bz2142518-IPaddr2-IPsrcaddr-support-policy-based-routing.patch
 Patch45:	bz2149968-lvmlockd-add-use_lvmlockd-if-missing.patch
 Patch46:	bz2174896-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch
-Patch47:	bz2179003-mysql-replication-fixes.patch
+Patch47:	bz2179003-mysql-1-replication-fixes.patch
 Patch48:	bz2174911-LVM-activate-failover-with-missing-pvs.patch
 Patch49:	bz2182415-azure-events-1-fix-no-transition-summary.patch
 Patch50:	bz2182415-azure-events-2-improve-logic.patch
 Patch51:	bz2183133-Filesystem-fail-efs-utils-not-installed.patch
 Patch52:	bz2184779-Filesystem-systemd-drop-in-net-fs.patch
+Patch53:	bz2179003-mysql-2-fix-demoted-score-bounce.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -278,6 +279,7 @@ exit 1
 %patch50 -p1
 %patch51 -p1
 %patch52 -p1
+%patch53 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -599,6 +601,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Jun 14 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-39
+- mysql: fix replication issues
+
+  Resolves: rhbz#2179003
+
 * Mon May 22 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-38
 - resource-agents-paf: add perl-lib dependency
 - Filesystem: create systemd drop-in for network filesystems
@@ -614,10 +621,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
   Resolves: rhbz#2183133
 
 * Tue Mar 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-36
-- mysql: fix replication issues
 - LVM-activate: failover with missing PVs
 
-  Resolves: rhbz#2179003
   Resolves: rhbz#2174911
 
 * Tue Mar 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-35