Commit ff8bd88b authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe

drbd: fix resync throttling initialization

If for some reason DRBD resync was the only activity on a backend
device, drbd_rs_c_min_rate_throttle() would mistakenly decide that it is
still initialization time, and keep throttling the resync.

This patch explicitly initializes ->rs_last_events to the current
backend event counters, and drops the rs_last_events == 0 from the
throttle condition.
Reported-by: default avatarMikhail Sugakov <msugakov@amazon.de>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a8821531
...@@ -2482,7 +2482,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device) ...@@ -2482,7 +2482,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
atomic_read(&device->rs_sect_ev); atomic_read(&device->rs_sect_ev);
if (atomic_read(&device->ap_actlog_cnt) if (atomic_read(&device->ap_actlog_cnt)
|| !device->rs_last_events || curr_events - device->rs_last_events > 64) { || curr_events - device->rs_last_events > 64) {
unsigned long rs_left; unsigned long rs_left;
int i; int i;
......
...@@ -1099,7 +1099,6 @@ __drbd_set_state(struct drbd_device *device, union drbd_state ns, ...@@ -1099,7 +1099,6 @@ __drbd_set_state(struct drbd_device *device, union drbd_state ns,
set_ov_position(device, ns.conn); set_ov_position(device, ns.conn);
device->rs_start = now; device->rs_start = now;
device->rs_last_events = 0;
device->rs_last_sect_ev = 0; device->rs_last_sect_ev = 0;
device->ov_last_oos_size = 0; device->ov_last_oos_size = 0;
device->ov_last_oos_start = 0; device->ov_last_oos_start = 0;
......
...@@ -1592,11 +1592,15 @@ void drbd_resync_after_changed(struct drbd_device *device) ...@@ -1592,11 +1592,15 @@ void drbd_resync_after_changed(struct drbd_device *device)
void drbd_rs_controller_reset(struct drbd_device *device) void drbd_rs_controller_reset(struct drbd_device *device)
{ {
struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
struct fifo_buffer *plan; struct fifo_buffer *plan;
atomic_set(&device->rs_sect_in, 0); atomic_set(&device->rs_sect_in, 0);
atomic_set(&device->rs_sect_ev, 0); atomic_set(&device->rs_sect_ev, 0);
device->rs_in_flight = 0; device->rs_in_flight = 0;
device->rs_last_events =
(int)part_stat_read(&disk->part0, sectors[0]) +
(int)part_stat_read(&disk->part0, sectors[1]);
/* Updating the RCU protected object in place is necessary since /* Updating the RCU protected object in place is necessary since
this function gets called from atomic context. this function gets called from atomic context.
...@@ -1743,7 +1747,6 @@ void drbd_start_resync(struct drbd_device *device, enum drbd_conns side) ...@@ -1743,7 +1747,6 @@ void drbd_start_resync(struct drbd_device *device, enum drbd_conns side)
device->rs_failed = 0; device->rs_failed = 0;
device->rs_paused = 0; device->rs_paused = 0;
device->rs_same_csum = 0; device->rs_same_csum = 0;
device->rs_last_events = 0;
device->rs_last_sect_ev = 0; device->rs_last_sect_ev = 0;
device->rs_total = tw; device->rs_total = tw;
device->rs_start = now; device->rs_start = now;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment