diff options
| author |   Lars Ellenberg <lars.ellenberg@linbit.com> | 2016-06-14 00:26:11 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2016-06-13 21:43:03 -0600 |
| commit | be115b69f1d64e3322d46fa8d989625b39807fe5 (patch) | |
| tree | 614473650e4a14d4f2e563fa9870ea4a29f11611 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: bitmap bulk IO: do not always suspend IO (diff) | |
| download | linux-dev-be115b69f1d64e3322d46fa8d989625b39807fe5.tar.xz linux-dev-be115b69f1d64e3322d46fa8d989625b39807fe5.zip | |
drbd: change bitmap write-out when leaving resync states
When leaving resync states because of disconnect,
do the bitmap write-out synchronously in the drbd_disconnected() path.
When leaving resync states because we go back to AHEAD/BEHIND, or
because resync actually finished, or some disk was lost during resync,
trigger the write-out from after_state_ch().
The bitmap write-out for resync -> ahead/behind was missing completely before.
Note that this is all only an optimization to avoid double-resyncs of
already completed blocks in case this node crashes.
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/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 1ee002352ea2..dcadea2b7bda 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -4795,9 +4795,11 @@ static int drbd_disconnected(struct drbd_peer_device *peer_device) drbd_md_sync(device); - /* serialize with bitmap writeout triggered by the state change, - * if any. */ - wait_event(device->misc_wait, !test_bit(BITMAP_IO, &device->flags)); + if (get_ldev(device)) { + drbd_bitmap_io(device, &drbd_bm_write_copy_pages, + "write from disconnected", BM_LOCKED_CHANGE_ALLOWED); + put_ldev(device); + } /* tcp_close and release of sendpage pages can be deferred. I don't * want to use SO_LINGER, because apparently it can be deferred for |