diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2015-02-19 14:01:50 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-11-25 17:22:01 +0100 |
| commit | 9bd2eb2c98239c465a51571b5c2a465a2ff7d70b (patch) | |
| tree | bbdb27c0da6ac182a61e0483abaedf7dd03563d9 /drivers/block | |
| parent | drbd: drbdsetup detach of an unresponsive local disk should not block IO "for... (diff) | |
| download | linux-9bd2eb2c98239c465a51571b5c2a465a2ff7d70b.tar.xz linux-9bd2eb2c98239c465a51571b5c2a465a2ff7d70b.zip | |
drbd: also bump UUIDs if a diskless primary connects
If for some reason the primary lost its disk *and* the replication link
before it is able to communicate the disk loss, probably blocked IO,
then later is able to re-establish the connection, the peer needs to
bump its UUIDs just like it does when peer only loses the disk
and is able to communicate this in time.
Otherwise, a later re-attach of the disk on the primary may start a
resync in the "wrong" direction.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index bc4b45bf9ace..06afd4df1b7b 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1781,7 +1781,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, } if (ns.pdsk < D_INCONSISTENT && get_ldev(device)) { - if (os.peer == R_SECONDARY && ns.peer == R_PRIMARY && + if (os.peer != R_PRIMARY && ns.peer == R_PRIMARY && device->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) { drbd_uuid_new_current(device); drbd_send_uuids(peer_device); |