--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
Dear Stable Release Team,
[ Reason ]
Shortly after the release of bookworm we got a report that Pacemaker
regressed in certain migration scenarios when compared to the bullseye
version. Upstream identified the cause (a bug already fixed in 2.1.6),
and after backporting the fix the submitter acknowledged that they can't
reproduce the bug anymore with the proposed packages.
https://bugs.clusterlabs.org/show_bug.cgi?id=5521
Pacemaker package bug opened after discussion on the mailing list:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040165
[ Impact ]
Core HA functionality is impacted, there's no easy way to work around
the problem. Pacemaker 2.1.5-1 is unsuitable for big portion of its
intended applications.
[ Tests ]
The submitter tested and confirmed the fix.
[ Risks ]
The patch is small but the backport wasn't trivial due to extensive
refactorings meanwhile. I asked upstream to sanity-check it, but
haven't got a reply yet.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
$ debdiff pacemaker_2.1.5-1.dsc pacemaker_2.1.5-1+deb12u1.dsc
diff -Nru pacemaker-2.1.5/debian/changelog pacemaker-2.1.5/debian/changelog
--- pacemaker-2.1.5/debian/changelog 2023-01-22 16:38:34.000000000 +0100
+++ pacemaker-2.1.5/debian/changelog 2023-07-02 21:39:59.000000000 +0200
@@ -1,3 +1,11 @@
+pacemaker (2.1.5-1+deb12u1) bookworm; urgency=medium
+
+ * [20411a8] New patch: Fix: scheduler: handle cleaned migrate_from history
+ correctly.
+ Thanks to Ken Gaillot (Closes: #1040165)
+
+ -- Ferenc Wágner <wferi@debian.org> Sun, 02 Jul 2023 21:39:59 +0200
+
pacemaker (2.1.5-1) unstable; urgency=medium
* [5792d59] Work around lazy loading of GitHub release pages in watch file
diff -Nru pacemaker-2.1.5/debian/gbp.conf pacemaker-2.1.5/debian/gbp.conf
--- pacemaker-2.1.5/debian/gbp.conf 2023-01-22 13:10:39.000000000 +0100
+++ pacemaker-2.1.5/debian/gbp.conf 2023-07-02 21:39:59.000000000 +0200
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/master
+debian-branch = debian/bookworm
upstream-branch = upstream/latest
[import-orig]
diff -Nru pacemaker-2.1.5/debian/patches/Fix-scheduler-handle-cleaned-migrate_from-history-correct.patch pacemaker-2.1.5/debian/patches/Fix-scheduler-handle-cleaned-migrate_from-history-correct.patch
--- pacemaker-2.1.5/debian/patches/Fix-scheduler-handle-cleaned-migrate_from-history-correct.patch 1970-01-01 01:00:00.000000000 +0100
+++ pacemaker-2.1.5/debian/patches/Fix-scheduler-handle-cleaned-migrate_from-history-correct.patch 2023-07-02 21:39:59.000000000 +0200
@@ -0,0 +1,30 @@
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Wed, 1 Feb 2023 17:12:13 -0600
+Subject: Fix: scheduler: handle cleaned migrate_from history correctly
+
+Fixes T623
+---
+ lib/pengine/unpack.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
+index 5fcba3b..abfd06f 100644
+--- a/lib/pengine/unpack.c
++++ b/lib/pengine/unpack.c
+@@ -2920,6 +2920,16 @@ unpack_migrate_to_success(pe_resource_t *rsc, pe_node_t *node, xmlNode *xml_op,
+ }
+
+ } else { // Pending, or complete but erased
++
++ /* If there is no history at all for the resource on an online target, then
++ * it was likely cleaned. Just return, and we'll schedule a probe. Once we
++ * have the probe result, it will be reflected in target_newer_state.
++ */
++ if ((target_node != NULL) && target_node->details->online
++ && unknown_on_node(rsc->id, target, data_set)) {
++ return;
++ }
++
+ /* If the resource has newer state on the target, this migrate_to no
+ * longer matters for the target.
+ */
diff -Nru pacemaker-2.1.5/debian/patches/series pacemaker-2.1.5/debian/patches/series
--- pacemaker-2.1.5/debian/patches/series 2023-01-22 13:31:42.000000000 +0100
+++ pacemaker-2.1.5/debian/patches/series 2023-07-02 21:39:59.000000000 +0200
@@ -5,3 +5,4 @@
Shipping-the-CTS-is-not-useful.patch
Always-run-Inkscape-under-the-C.UTF-8-locale.patch
Fix-typos-resouce-resource.patch
+Fix-scheduler-handle-cleaned-migrate_from-history-correct.patch
diff -Nru pacemaker-2.1.5/debian/salsa-ci.yml pacemaker-2.1.5/debian/salsa-ci.yml
--- pacemaker-2.1.5/debian/salsa-ci.yml 2023-01-22 13:10:39.000000000 +0100
+++ pacemaker-2.1.5/debian/salsa-ci.yml 2023-07-02 21:39:59.000000000 +0200
@@ -5,6 +5,7 @@
variables:
SALSA_CI_REPROTEST_ENABLE_DIFFOSCOPE: 1
+ RELEASE: bookworm
autopkgtest:
extends: .test-autopkgtest
--
Thanks,
Feri.
--- End Message ---