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
58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From 2f464b8e8235efe2c5d972cf8054dcc2010b100e Mon Sep 17 00:00:00 2001
|
|
From: Philipp Reisner <philipp.reisner@linbit.com>
|
|
Date: Wed, 14 Aug 2024 17:42:44 +0200
|
|
Subject: [PATCH 04/32] drbd: fix exposed_uuid going backward
|
|
|
|
When a diskless node in the primary role creates a new current UUID,
|
|
it sends it all its UpToDate peers and sets it as its own exposed
|
|
UUID. If there is only one UpToDate node in the secondary role and it
|
|
sends its current UUID to the diskless primary at about the same time,
|
|
then with the following state change, through the function
|
|
ensure_expose_data_uuid(), the diskless primary sets its exposed_uuid
|
|
back to the previous one.
|
|
|
|
Avoid this problem by not accepting a current_uuid update from a peer
|
|
when I am primary (authoritative), and I have told the peer the latest
|
|
update, and that peer is already on that latest (authoritative) value.
|
|
---
|
|
drbd/drbd_main.c | 1 +
|
|
drbd/drbd_receiver.c | 10 +++++++++-
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
|
|
index 862438885f35..bc3283b045c9 100644
|
|
--- a/drbd/drbd_main.c
|
|
+++ b/drbd/drbd_main.c
|
|
@@ -1484,6 +1484,7 @@ int drbd_send_current_uuid(struct drbd_peer_device *peer_device, u64 current_uui
|
|
if (!p)
|
|
return -EIO;
|
|
|
|
+ peer_device->comm_current_uuid = current_uuid;
|
|
p->uuid = cpu_to_be64(current_uuid);
|
|
p->weak_nodes = cpu_to_be64(weak_nodes);
|
|
return drbd_send_command(peer_device, P_CURRENT_UUID, DATA_STREAM);
|
|
diff --git a/drbd/drbd_receiver.c b/drbd/drbd_receiver.c
|
|
index ee54cf3ac116..985fac8e69b3 100644
|
|
--- a/drbd/drbd_receiver.c
|
|
+++ b/drbd/drbd_receiver.c
|
|
@@ -5815,7 +5815,15 @@ static int receive_uuids110(struct drbd_connection *connection, struct packet_in
|
|
peer_md = device->ldev->md.peers;
|
|
spin_lock_irq(&device->ldev->md.uuid_lock);
|
|
}
|
|
- peer_device->current_uuid = be64_to_cpu(p->current_uuid);
|
|
+
|
|
+ if (device->resource->role[NOW] != R_PRIMARY ||
|
|
+ device->disk_state[NOW] != D_DISKLESS ||
|
|
+ (peer_device->current_uuid & ~UUID_PRIMARY) !=
|
|
+ (device->exposed_data_uuid & ~UUID_PRIMARY) ||
|
|
+ (peer_device->comm_current_uuid & ~UUID_PRIMARY) !=
|
|
+ (device->exposed_data_uuid & ~UUID_PRIMARY))
|
|
+ peer_device->current_uuid = be64_to_cpu(p->current_uuid);
|
|
+
|
|
peer_device->dirty_bits = be64_to_cpu(p->dirty_bits);
|
|
peer_device->uuid_flags = be64_to_cpu(p->uuid_flags);
|
|
if (peer_device->uuid_flags & UUID_FLAG_HAS_UNALLOC) {
|
|
--
|
|
2.35.3
|
|
|