Support adding a spare to a live md array with external metadata.
i.e. extend the 'md/dev-XXX/slot' attribute so that you can tell a device to fill an vacant slot in an and md array. Signed-off-by: Neil Brown <neilb@suse.de>
This commit is contained in:
parent
8ed0a5216a
commit
6c2fce2ef6
|
@ -1932,7 +1932,7 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
|
||||||
slot = -1;
|
slot = -1;
|
||||||
else if (e==buf || (*e && *e!= '\n'))
|
else if (e==buf || (*e && *e!= '\n'))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (rdev->mddev->pers) {
|
if (rdev->mddev->pers && slot == -1) {
|
||||||
/* Setting 'slot' on an active array requires also
|
/* Setting 'slot' on an active array requires also
|
||||||
* updating the 'rd%d' link, and communicating
|
* updating the 'rd%d' link, and communicating
|
||||||
* with the personality with ->hot_*_disk.
|
* with the personality with ->hot_*_disk.
|
||||||
|
@ -1940,8 +1940,6 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
|
||||||
* failed/spare devices. This normally happens automatically,
|
* failed/spare devices. This normally happens automatically,
|
||||||
* but not when the metadata is externally managed.
|
* but not when the metadata is externally managed.
|
||||||
*/
|
*/
|
||||||
if (slot != -1)
|
|
||||||
return -EBUSY;
|
|
||||||
if (rdev->raid_disk == -1)
|
if (rdev->raid_disk == -1)
|
||||||
return -EEXIST;
|
return -EEXIST;
|
||||||
/* personality does all needed checks */
|
/* personality does all needed checks */
|
||||||
|
@ -1955,6 +1953,44 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
|
||||||
sysfs_remove_link(&rdev->mddev->kobj, nm);
|
sysfs_remove_link(&rdev->mddev->kobj, nm);
|
||||||
set_bit(MD_RECOVERY_NEEDED, &rdev->mddev->recovery);
|
set_bit(MD_RECOVERY_NEEDED, &rdev->mddev->recovery);
|
||||||
md_wakeup_thread(rdev->mddev->thread);
|
md_wakeup_thread(rdev->mddev->thread);
|
||||||
|
} else if (rdev->mddev->pers) {
|
||||||
|
mdk_rdev_t *rdev2;
|
||||||
|
struct list_head *tmp;
|
||||||
|
/* Activating a spare .. or possibly reactivating
|
||||||
|
* if we every get bitmaps working here.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (rdev->raid_disk != -1)
|
||||||
|
return -EBUSY;
|
||||||
|
|
||||||
|
if (rdev->mddev->pers->hot_add_disk == NULL)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
rdev_for_each(rdev2, tmp, rdev->mddev)
|
||||||
|
if (rdev2->raid_disk == slot)
|
||||||
|
return -EEXIST;
|
||||||
|
|
||||||
|
rdev->raid_disk = slot;
|
||||||
|
if (test_bit(In_sync, &rdev->flags))
|
||||||
|
rdev->saved_raid_disk = slot;
|
||||||
|
else
|
||||||
|
rdev->saved_raid_disk = -1;
|
||||||
|
err = rdev->mddev->pers->
|
||||||
|
hot_add_disk(rdev->mddev, rdev);
|
||||||
|
if (err != 1) {
|
||||||
|
rdev->raid_disk = -1;
|
||||||
|
if (err == 0)
|
||||||
|
return -EEXIST;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
sprintf(nm, "rd%d", rdev->raid_disk);
|
||||||
|
if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm))
|
||||||
|
printk(KERN_WARNING
|
||||||
|
"md: cannot register "
|
||||||
|
"%s for %s\n",
|
||||||
|
nm, mdname(rdev->mddev));
|
||||||
|
|
||||||
|
/* don't wakeup anyone, leave that to userspace. */
|
||||||
} else {
|
} else {
|
||||||
if (slot >= rdev->mddev->raid_disks)
|
if (slot >= rdev->mddev->raid_disks)
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
|
|
|
@ -284,10 +284,15 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
|
||||||
int found = 0;
|
int found = 0;
|
||||||
int path;
|
int path;
|
||||||
struct multipath_info *p;
|
struct multipath_info *p;
|
||||||
|
int first = 0;
|
||||||
|
int last = mddev->raid_disks - 1;
|
||||||
|
|
||||||
|
if (rdev->raid_disk >= 0)
|
||||||
|
first = last = rdev->raid_disk;
|
||||||
|
|
||||||
print_multipath_conf(conf);
|
print_multipath_conf(conf);
|
||||||
|
|
||||||
for (path=0; path<mddev->raid_disks; path++)
|
for (path = first; path <= last; path++)
|
||||||
if ((p=conf->multipaths+path)->rdev == NULL) {
|
if ((p=conf->multipaths+path)->rdev == NULL) {
|
||||||
q = rdev->bdev->bd_disk->queue;
|
q = rdev->bdev->bd_disk->queue;
|
||||||
blk_queue_stack_limits(mddev->queue, q);
|
blk_queue_stack_limits(mddev->queue, q);
|
||||||
|
|
|
@ -1103,8 +1103,13 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
|
||||||
int found = 0;
|
int found = 0;
|
||||||
int mirror = 0;
|
int mirror = 0;
|
||||||
mirror_info_t *p;
|
mirror_info_t *p;
|
||||||
|
int first = 0;
|
||||||
|
int last = mddev->raid_disks - 1;
|
||||||
|
|
||||||
for (mirror=0; mirror < mddev->raid_disks; mirror++)
|
if (rdev->raid_disk >= 0)
|
||||||
|
first = last = rdev->raid_disk;
|
||||||
|
|
||||||
|
for (mirror = first; mirror <= last; mirror++)
|
||||||
if ( !(p=conf->mirrors+mirror)->rdev) {
|
if ( !(p=conf->mirrors+mirror)->rdev) {
|
||||||
|
|
||||||
blk_queue_stack_limits(mddev->queue,
|
blk_queue_stack_limits(mddev->queue,
|
||||||
|
|
|
@ -1116,6 +1116,8 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
|
||||||
int found = 0;
|
int found = 0;
|
||||||
int mirror;
|
int mirror;
|
||||||
mirror_info_t *p;
|
mirror_info_t *p;
|
||||||
|
int first = 0;
|
||||||
|
int last = mddev->raid_disks - 1;
|
||||||
|
|
||||||
if (mddev->recovery_cp < MaxSector)
|
if (mddev->recovery_cp < MaxSector)
|
||||||
/* only hot-add to in-sync arrays, as recovery is
|
/* only hot-add to in-sync arrays, as recovery is
|
||||||
|
@ -1125,12 +1127,16 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
|
||||||
if (!enough(conf))
|
if (!enough(conf))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (rdev->raid_disk)
|
||||||
|
first = last = rdev->raid_disk;
|
||||||
|
|
||||||
if (rdev->saved_raid_disk >= 0 &&
|
if (rdev->saved_raid_disk >= 0 &&
|
||||||
|
rdev->saved_raid_disk >= first &&
|
||||||
conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
|
conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
|
||||||
mirror = rdev->saved_raid_disk;
|
mirror = rdev->saved_raid_disk;
|
||||||
else
|
else
|
||||||
mirror = 0;
|
mirror = first;
|
||||||
for ( ; mirror < mddev->raid_disks; mirror++)
|
for ( ; mirror <= last ; mirror++)
|
||||||
if ( !(p=conf->mirrors+mirror)->rdev) {
|
if ( !(p=conf->mirrors+mirror)->rdev) {
|
||||||
|
|
||||||
blk_queue_stack_limits(mddev->queue,
|
blk_queue_stack_limits(mddev->queue,
|
||||||
|
|
|
@ -4607,21 +4607,27 @@ static int raid5_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
|
||||||
int found = 0;
|
int found = 0;
|
||||||
int disk;
|
int disk;
|
||||||
struct disk_info *p;
|
struct disk_info *p;
|
||||||
|
int first = 0;
|
||||||
|
int last = conf->raid_disks - 1;
|
||||||
|
|
||||||
if (mddev->degraded > conf->max_degraded)
|
if (mddev->degraded > conf->max_degraded)
|
||||||
/* no point adding a device */
|
/* no point adding a device */
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (rdev->raid_disk >= 0)
|
||||||
|
first = last = rdev->raid_disk;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* find the disk ... but prefer rdev->saved_raid_disk
|
* find the disk ... but prefer rdev->saved_raid_disk
|
||||||
* if possible.
|
* if possible.
|
||||||
*/
|
*/
|
||||||
if (rdev->saved_raid_disk >= 0 &&
|
if (rdev->saved_raid_disk >= 0 &&
|
||||||
|
rdev->saved_raid_disk >= first &&
|
||||||
conf->disks[rdev->saved_raid_disk].rdev == NULL)
|
conf->disks[rdev->saved_raid_disk].rdev == NULL)
|
||||||
disk = rdev->saved_raid_disk;
|
disk = rdev->saved_raid_disk;
|
||||||
else
|
else
|
||||||
disk = 0;
|
disk = first;
|
||||||
for ( ; disk < conf->raid_disks; disk++)
|
for ( ; disk <= last ; disk++)
|
||||||
if ((p=conf->disks + disk)->rdev == NULL) {
|
if ((p=conf->disks + disk)->rdev == NULL) {
|
||||||
clear_bit(In_sync, &rdev->flags);
|
clear_bit(In_sync, &rdev->flags);
|
||||||
rdev->raid_disk = disk;
|
rdev->raid_disk = disk;
|
||||||
|
|
Loading…
Reference in New Issue