6ee9ba5898
* Changelog from Linbit:
9.1.23 (api:genl2/proto:86-101,118-121/transport:18)
--------
* Fix a corner case that can happen when DRBD establishes multiple
connections in parallel, which could lead one connection to end up in
an inconsistent replication state of WFBitMapT/Established
* Fix a corner case in which a reconciliation resync ends up in
WFBitMapT/Established
* Restrict protocol compatibility to the most recent 8.4 and 9.0 releases
* Fix a corner case causing a module ref leak on drbd_transport_tcp;
if it hits, you can not rmmod it
* rate-limit resync progress while resync is paused
* resync-target inherits history UUIDs when resync finishes,
this can prevent unexpected "unrelared data" events later
* Updated compatibility code for Linux 6.11 and 6.12
* remove patches which already included in the new version:
0001-drbd-properly-rate-limit-resync-progress-reports.patch
0002-drbd-inherit-history-UUIDs-from-sync-source-when-res.patch
0003-build-compat-fix-line-offset-in-annotation-pragmas-p.patch
0004-drbd-fix-exposed_uuid-going-backward.patch
0005-drbd-Proper-locking-around-new_current_uuid-on-a-dis.patch
0006-build-CycloneDX-fix-bom-ref-add-purl.patch
0007-build-Another-update-to-the-spdx-files.patch
0008-build-generate-spdx.json-not-tag-value-format.patch
0009-compat-fix-gen_patch_names-for-bdev_file_open_by_pat.patch
0010-compat-fix-nla_nest_start_noflag-test.patch
0011-compat-fix-blk_alloc_disk-rule.patch
0012-drbd-remove-const-from-function-return-type.patch
0013-drbd-don-t-set-max_write_zeroes_sectors-in-decide_on.patch
0014-drbd-split-out-a-drbd_discard_supported-helper.patch
0015-drbd-atomically-update-queue-limits-in-drbd_reconsid.patch
0016-compat-test-and-patch-for-queue_limits_start_update.patch
0017-compat-specify-which-essential-change-was-not-made.patch
0018-gen_patch_names-reorder-blk_mode_t.patch
0019-compat-fix-blk_queue_update_readahead-patch.patch
0020-compat-test-and-patch-for-que_limits-max_hw_discard_.patch
0021-compat-fixup-write_zeroes__no_capable.patch
0022-compat-fixup-queue_flag_discard__yes_present.patch
0023-drbd-move-flags-to-queue_limits.patch
0024-compat-test-and-patch-for-queue_limits.features.patch
0025-drbd-Annotate-struct-fifo_buffer-with-__counted_by.patch
0026-compat-test-and-patch-for-__counted_by.patch
0027-drbd-fix-function-cast-warnings-in-state-machine.patch
0028-Add-missing-documentation-of-peer_device-parameter-t.patch
0030-drbd-kref_put-path-when-kernel_accept-fails.patch
0031-build-fix-typo-in-Makefile.spatch.patch
0032-drbd-open-do-not-delay-open-if-already-Primary.patch
* removed patch which is not needed anymore:
boo1231290_fix_drbd_build_error_against_kernel_v6.11.0.patch
boo1233222_fix_drbd_build_error_against_kernel_v6.11.6.patch
* update:
drbd_git_revision
drbd.spec
* add upstream patches to align commit d64ebe7eb7df:
0001-drbd-Fix-memory-leak.patch
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=155
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From c8e2a3c4355b4794267cd6e58a074802b4607cb9 Mon Sep 17 00:00:00 2001
|
|
From: Joel Colledge <joel.colledge@linbit.com>
|
|
Date: Fri, 22 Sep 2023 16:57:24 +0200
|
|
Subject: [PATCH 20/20] drbd: do not allow auto-demote to be interrupted by
|
|
signal
|
|
|
|
Pending signals can mess up auto-demote:
|
|
|
|
drbd res: Preparing cluster-wide state change 671410162 (0->-1 3/2)
|
|
drbd res: Aborting cluster-wide state change 671410162 (6ms) rv = -21
|
|
drbd res: Auto-demote failed: Interrupted state change
|
|
|
|
After this state change failure no process has the DRBD device open, but
|
|
DRBD remains Primary.
|
|
---
|
|
drbd/drbd_main.c | 33 +++++++++++++++++++++++----------
|
|
1 file changed, 23 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
|
|
index 1864861db21d..0719229f210e 100644
|
|
--- a/drbd/drbd_main.c
|
|
+++ b/drbd/drbd_main.c
|
|
@@ -2851,17 +2851,30 @@ static void drbd_release(struct gendisk *gd)
|
|
!test_and_set_bit(DESTROYING_DEV, &device->flags))
|
|
call_rcu(&device->rcu, drbd_reclaim_device);
|
|
|
|
- if (resource->res_opts.auto_promote) {
|
|
- enum drbd_state_rv rv;
|
|
+ if (resource->res_opts.auto_promote &&
|
|
+ open_rw_cnt == 0 &&
|
|
+ resource->role[NOW] == R_PRIMARY &&
|
|
+ !test_bit(EXPLICIT_PRIMARY, &resource->flags)) {
|
|
+ sigset_t mask, oldmask;
|
|
+ int rv;
|
|
+
|
|
+ /*
|
|
+ * Auto-demote is triggered by the last opener releasing the
|
|
+ * DRBD device. However, it is an implicit action, so it should
|
|
+ * not be affected by the state of the process. In particular,
|
|
+ * it should ignore any pending signals. It may be the case
|
|
+ * that the process is releasing DRBD because it is being
|
|
+ * terminated using a signal.
|
|
+ */
|
|
+ sigfillset(&mask);
|
|
+ sigprocmask(SIG_BLOCK, &mask, &oldmask);
|
|
|
|
- if (was_writable && open_rw_cnt == 0 &&
|
|
- resource->role[NOW] == R_PRIMARY &&
|
|
- !test_bit(EXPLICIT_PRIMARY, &resource->flags)) {
|
|
- rv = drbd_set_role(resource, R_SECONDARY, false, "auto-demote", NULL);
|
|
- if (rv < SS_SUCCESS)
|
|
- drbd_warn(resource, "Auto-demote failed: %s (%d)\n",
|
|
- drbd_set_st_err_str(rv), rv);
|
|
- }
|
|
+ rv = drbd_set_role(resource, R_SECONDARY, false, "auto-demote", NULL);
|
|
+ if (rv < SS_SUCCESS)
|
|
+ drbd_warn(resource, "Auto-demote failed: %s (%d)\n",
|
|
+ drbd_set_st_err_str(rv), rv);
|
|
+
|
|
+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
|
|
}
|
|
|
|
if (open_ro_cnt == 0 && open_rw_cnt == 0 && resource->fail_io[NOW]) {
|
|
--
|
|
2.35.3
|
|
|