Merge ~lvoytek/ubuntu/+source/libqb:posix-fallocate-retry-jammy into ubuntu/+source/libqb:ubuntu/jammy-devel

[Lena Voytek]

SRUing a fix from kinetic and upstream that retries posix_fallocate when it fails from time to time. This fix was confirmed to work by the reporter.

PPA: ppa:lvoytek/libqb-retry-posix-fallocate-jammy

[Andreas Hasenack (ahasenack)]

Looks good, just a version fix and suggested change to the wording of the patch description.

review: Needs Fixing

[Lena Voytek (lvoytek)]

Updated, thanks!

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Sponsored:

$ dput ubuntu ../libqb_2.0.4-1ubuntu0.1_source.changes
Uploading libqb using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running checksum: verify checksums before uploading
running check-debs: makes sure the upload contains a binary package
running nobug: Stop if uploading without any bug reference.
running gpg: check GnuPG signatures before the upload
running required-fields: check whether a field is present and non-empty in the changes file
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running ppaforppaonly: Stop uploads to the archive with or to ppa without ~ppa suffix.
running placeholderbug: Stop if using common placeholder numbers as bug reference.
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
running suite-mismatch: check the target distribution for common errors
Uploading libqb_2.0.4-1ubuntu0.1.dsc
Uploading libqb_2.0.4-1ubuntu0.1.debian.tar.xz
Uploading libqb_2.0.4-1ubuntu0.1_source.buildinfo
Uploading libqb_2.0.4-1ubuntu0.1_source.changes

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, lvoytek
Uploaders: ahasenack
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 33d5484..d93fb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libqb (2.0.4-1ubuntu0.1) jammy; urgency=medium
+
+  * d/p/retry-if-posix-fallocate-interrupted-eintr.patch: Retry posix_fallocate
+    when the error - couldn't create file for mmap - occurs (LP: #1978955)
+
+ -- Lena Voytek <[e-mail]>  Wed, 22 Jun 2022 11:52:46 -0700
+
 libqb (2.0.4-1build1) jammy; urgency=high
 
   * No change rebuild for ppc64el baseline bump.
diff --git a/debian/patches/retry-if-posix-fallocate-interrupted-eintr.patch b/debian/patches/retry-if-posix-fallocate-interrupted-eintr.patch
new file mode 100644
index 0000000..58c5b38
--- /dev/null
+++ b/debian/patches/retry-if-posix-fallocate-interrupted-eintr.patch
@@ -0,0 +1,52 @@
+Description: Retry a few times if posix_fallocate fails with EINTR
+ Pacemaker sometimes returns errors during posix_fallocate that can cause a crash.
+ The function will be retried up to five times to help avoid the crash.
+Author: Jakub Jankowski <[e-mail]>
+Origin: upstream, https://github.com/ClusterLabs/libqb/pull/453/commits/2e259c9d6e13968665678745f1e774bc4ccf8806
+Bug: https://github.com/ClusterLabs/libqb/issues/451
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libqb/+bug/1978955
+Bug-SUSE: https://www.suse.com/support/kb/doc/?id=000020566
+Last-Update: 2022-06-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/unix.c
++++ b/lib/unix.c
+@@ -81,6 +81,9 @@
+ 	int32_t i;
+ #endif
+ 	char *is_absolute = strchr(file, '/');
++#ifdef HAVE_POSIX_FALLOCATE
++	int32_t fallocate_retry = 5;
++#endif
+ 
+ 	if (is_absolute) {
+ 		(void)strlcpy(path, file, PATH_MAX);
+@@ -121,12 +124,22 @@
+ 	}
+ #endif
+ #ifdef HAVE_POSIX_FALLOCATE
+-	if ((res = posix_fallocate(fd, 0, bytes)) != 0) {
+-		errno = res;
+-		res = -1 * res;
+-		qb_util_perror(LOG_ERR, "couldn't allocate file %s", path);
+-		goto unlink_exit;
+-	}
++    /* posix_fallocate(3) can be interrupted by a signal,
++       so retry few times before giving up */
++    do {
++		fallocate_retry--;
++		res = posix_fallocate(fd, 0, bytes);
++		if (res == EINTR) {
++			qb_util_log(LOG_DEBUG, "got EINTR trying to allocate file %s, retrying...", path);
++			continue;
++		} else if (res != 0) {
++			errno = res;
++			res = -1 * res;
++			qb_util_perror(LOG_ERR, "couldn't allocate file %s", path);
++			goto unlink_exit;
++		}
++		break;
++	} while (fallocate_retry > 0);
+ #else
+ 	if (file_flags & O_CREAT) {
+ 		long page_size = sysconf(_SC_PAGESIZE);
diff --git a/debian/patches/series b/debian/patches/series
index 473ff30..66a45af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ hurd-definition-of-PATH_MAX-must-be-included-separately.patch
 tests-always-run-the-SHM-suite-just-expect-failures.patch
 hurd-the-socket-tests-are-expected-to-fail.patch
 Fix-typos-and-inconsistencies-in-doxygen2man-help-text.patch
+retry-if-posix-fallocate-interrupted-eintr.patch