diff options
author | Goldwyn Rodrigues <rgoldwyn@suse.com> | 2015-10-22 01:01:25 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.com> | 2015-10-24 02:16:18 -0400 |
commit | 28c1b9fdf4562b52fe104384b16238c39c8a8d40 (patch) | |
tree | 000e3a7de890238eb97c6530256958f30e0b8cda /drivers/md/raid1.c | |
parent | 30661b49be784e8eecde60330ad7a8bdeb5291b1 (diff) |
md-cluster: Call update_raid_disks() if another node --grow's raid_disks
To incorporate --grow feature executed on one node, other nodes need to
acknowledge the change in number of disks. Call update_raid_disks()
to update internal data structures.
This leads to call check_reshape() -> md_allow_write() -> md_update_sb(),
this results in a deadlock. This is done so it can safely allocate memory
(which might trigger writeback which might write to raid1). This is
not required for md with a bitmap.
In the clustered case, we don't perform md_update_sb() in md_allow_write(),
but in do_md_run(). Also we disable safemode for clustered mode.
mddev->recovery_cp need not be set in check_sb_changes() because this
is required only when a node reads another node's bitmap. mddev->recovery_cp
(which is read from sb->resync_offset), is set only if mddev is in_sync.
Since we disabled safemode, in_sync is set to zero.
In a clustered environment, the MD may not be in sync because another
node could be writing to it. So make sure that in_sync is not set in
case of clustered node in __md_stop_writes().
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r-- | drivers/md/raid1.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index ce2d797f8787..c1ad0b075807 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -3044,9 +3044,11 @@ static int raid1_reshape(struct mddev *mddev) | |||
3044 | return -EINVAL; | 3044 | return -EINVAL; |
3045 | } | 3045 | } |
3046 | 3046 | ||
3047 | err = md_allow_write(mddev); | 3047 | if (!mddev_is_clustered(mddev)) { |
3048 | if (err) | 3048 | err = md_allow_write(mddev); |
3049 | return err; | 3049 | if (err) |
3050 | return err; | ||
3051 | } | ||
3050 | 3052 | ||
3051 | raid_disks = mddev->raid_disks + mddev->delta_disks; | 3053 | raid_disks = mddev->raid_disks + mddev->delta_disks; |
3052 | 3054 | ||