SHA256
1
0
forked from pool/drbd
drbd/0002-drbd-inherit-history-UUIDs-from-sync-source-when-res.patch

61 lines
2.2 KiB
Diff
Raw Normal View History

- Update DRBD version from 9.1.22 to 9.1.23 (boo#1234849) * 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
2024-12-27 04:43:25 +01:00
From f6613104a37c1d43cb50fd619afccba370db47a0 Mon Sep 17 00:00:00 2001
From: Joel Colledge <joel.colledge@linbit.com>
Date: Tue, 20 Aug 2024 12:28:09 +0100
Subject: [PATCH 02/32] drbd: inherit history UUIDs from sync source when
resync finishes
This prevents unexpected "unrelated data" or "split-brain" situations
from occurring later. For example with nodes A, B and C:
* A diskless, B, C with disk, all connected, on UUID X
* Down B
* Write on C, new UUID Y generated
* Add disk on A, resyncs from C
* Down C
* Up B, connects to A, should resync from A
Without this change, "unrelated data" or "split-brain" occurs between A
and B.
Node A has current UUID Y, but knows nothing about X.
Node B has current UUID X, but knows nothing about Y.
This scenario is also possible with "quorum majority".
Fix this by adding the history and bitmap UUIDs from the sync source
into the history on the sync target when a resync finishes. In the above
scenario, this adds the UUID X into the history on A and so has the
effect that a full sync from A to B occurs in the final step.
---
drbd/drbd_main.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
index 7968be7c4c3f..862438885f35 100644
--- a/drbd/drbd_main.c
+++ b/drbd/drbd_main.c
@@ -5030,11 +5030,22 @@ u64 drbd_uuid_resync_finished(struct drbd_peer_device *peer_device) __must_hold(
{
struct drbd_device *device = peer_device->device;
unsigned long flags;
+ int i;
u64 ss_nz_bm; /* sync_source has non zero bitmap for. expressed as nodemask */
u64 pwcu; /* peers with current uuid */
u64 newer;
spin_lock_irqsave(&device->ldev->md.uuid_lock, flags);
+ // Inherit history from the sync source
+ for (i = 0; i < ARRAY_SIZE(peer_device->history_uuids); i++)
+ _drbd_uuid_push_history(device, peer_device->history_uuids[i] & ~UUID_PRIMARY);
+
+ // Inherit history in bitmap UUIDs from the sync source
+ for (i = 0; i < DRBD_PEERS_MAX; i++)
+ if (peer_device->bitmap_uuids[i] != -1)
+ _drbd_uuid_push_history(device,
+ peer_device->bitmap_uuids[i] & ~UUID_PRIMARY);
+
ss_nz_bm = __test_bitmap_slots_of_peer(peer_device);
pwcu = peers_with_current_uuid(device, peer_device->current_uuid);
--
2.35.3