Commit 2bb77736 authored by NeilBrown's avatar NeilBrown
Browse files

md/raid10: Make use of new recovery_disabled handling 



When we get a read error during recovery, RAID10 previously
arranged for the recovering device to appear to fail so that
the recovery stops and doesn't restart.  This is misleading and wrong.

Instead, make use of the new recovery_disabled handling and mark
the target device and having recovery disabled.

Add appropriate checks in add_disk and remove_disk so that devices
are removed and not re-added when recovery is disabled.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 5389042f

drivers/md/raid10.c

+36 −26
Original line number Diff line number Diff line
@@ -1099,7 +1099,6 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) 
	conf_t *conf = mddev->private;

	int err = -EEXIST;

	int mirror;

	mirror_info_t *p;

	int first = 0;

	int last = conf->raid_disks - 1;
@@ -1119,8 +1118,12 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) 
		mirror = rdev->saved_raid_disk;

	else

		mirror = first;

	for ( ; mirror <= last ; mirror++)

		if ( !(p=conf->mirrors+mirror)->rdev) {

	for ( ; mirror <= last ; mirror++) {

		mirror_info_t *p = &conf->mirrors[mirror];

		if (p->recovery_disabled == mddev->recovery_disabled)

			continue;

		if (!p->rdev)

			continue;



		disk_stack_limits(mddev->gendisk, rdev->bdev,

				  rdev->data_offset << 9);
@@ -1169,6 +1172,7 @@ static int raid10_remove_disk(mddev_t *mddev, int number) 
		 * is not possible.

		 */

		if (!test_bit(Faulty, &rdev->flags) &&

		    mddev->recovery_disabled != p->recovery_disabled &&

		    enough(conf)) {

			err = -EBUSY;

			goto abort;
@@ -1383,8 +1387,14 @@ static void recovery_request_write(mddev_t *mddev, r10bio_t *r10_bio) 
	md_sync_acct(conf->mirrors[d].rdev->bdev, wbio->bi_size >> 9);

	if (test_bit(R10BIO_Uptodate, &r10_bio->state))

		generic_make_request(wbio);

	else

		bio_endio(wbio, -EIO);

	else {

		printk(KERN_NOTICE

		       "md/raid10:%s: recovery aborted due to read error\n",

		       mdname(mddev));

		conf->mirrors[d].recovery_disabled = mddev->recovery_disabled;

		set_bit(MD_RECOVERY_INTR, &mddev->recovery);

		bio_endio(wbio, 0);

	}

}

drivers/md/raid10.h

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ typedef struct mirror_info mirror_info_t; 
struct mirror_info {

	mdk_rdev_t	*rdev;

	sector_t	head_position;

	int		recovery_disabled;	/* matches

						 * mddev->recovery_disabled

						 * when we shouldn't try

						 * recovering this device.

						 */

};



typedef struct r10bio_s r10bio_t;

CRA Git | Maintained and supported by SUSTech CRA and CCSE