diff options
| author | Guoqing Jiang <gqjiang@suse.com> | 2018-10-18 11:37:47 +0300 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2018-10-18 19:40:48 +0300 |
| commit | cb9ee154317b084a96a7c2b771d1688f39fc714c (patch) | |
| tree | d6388ae05edc17fde448963052bb3b0edd61fb7d /drivers/md/md-cluster.c | |
| parent | cbce6863b6d04f6eac6b144bcfaaf11a189d6533 (diff) | |
| download | linux-cb9ee154317b084a96a7c2b771d1688f39fc714c.tar.xz | |
md-cluster: send BITMAP_NEEDS_SYNC message if reshaping is interrupted
We need to continue the reshaping if it was interrupted in
original node. So original node should call resync_bitmap
in case reshaping is aborted.
Then BITMAP_NEEDS_SYNC message is broadcasted to other nodes,
node which continues the reshaping should restart reshape from
mddev->reshape_position instead of from the first beginning.
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/md-cluster.c')
| -rw-r--r-- | drivers/md/md-cluster.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index 792e0218a42f..f1b870766deb 100644 --- a/drivers/md/md-cluster.c +++ b/drivers/md/md-cluster.c @@ -333,6 +333,12 @@ static void recover_bitmaps(struct md_thread *thread) } spin_unlock_irq(&cinfo->suspend_lock); + /* Kick off a reshape if needed */ + if (test_bit(MD_RESYNCING_REMOTE, &mddev->recovery) && + test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && + mddev->reshape_position != MaxSector) + md_wakeup_thread(mddev->sync_thread); + if (hi > 0) { if (lo < mddev->recovery_cp) mddev->recovery_cp = lo; @@ -1020,10 +1026,17 @@ static int leave(struct mddev *mddev) if (!cinfo) return 0; - /* BITMAP_NEEDS_SYNC message should be sent when node + /* + * BITMAP_NEEDS_SYNC message should be sent when node * is leaving the cluster with dirty bitmap, also we - * can only deliver it when dlm connection is available */ - if (cinfo->slot_number > 0 && mddev->recovery_cp != MaxSector) + * can only deliver it when dlm connection is available. + * + * Also, we should send BITMAP_NEEDS_SYNC message in + * case reshaping is interrupted. + */ + if ((cinfo->slot_number > 0 && mddev->recovery_cp != MaxSector) || + (mddev->reshape_position != MaxSector && + test_bit(MD_CLOSING, &mddev->flags))) resync_bitmap(mddev); set_bit(MD_CLUSTER_HOLDING_MUTEX_FOR_RECVD, &cinfo->state); |