diff options
| author | NeilBrown <neilb@suse.de> | 2009-01-09 08:31:11 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-01-09 08:31:11 +1100 |
| commit | 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 (patch) | |
| tree | e1bea8143538fc3eaeeb8578c2f9231e32809a25 /drivers/md/md.c | |
| parent | efeb53c0e57213e843b7ef3cc6ebcdea7d6186ac (diff) | |
| download | lwn-4044ba58dd15cb01797c4fd034f39ef4a75f7cc3.tar.gz lwn-4044ba58dd15cb01797c4fd034f39ef4a75f7cc3.zip | |
md: don't retry recovery of raid1 that fails due to error on source drive.
If a raid1 has only one working drive and it has a sector which
gives an error on read, then an attempt to recover onto a spare will
fail, but as the single remaining drive is not removed from the
array, the recovery will be immediately re-attempted, resulting
in an infinite recovery loop.
So detect this situation and don't retry recovery once an error
on the lone remaining drive is detected.
Allow recovery to be retried once every time a spare is added
in case the problem wasn't actually a media error.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index f5cbb9d2371a..41e2509bf896 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1500,6 +1500,9 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) list_add_rcu(&rdev->same_set, &mddev->disks); bd_claim_by_disk(rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); + + /* May as well allow recovery to be retried once */ + mddev->recovery_disabled = 0; return 0; fail: @@ -6175,7 +6178,7 @@ static int remove_and_add_spares(mddev_t *mddev) } } - if (mddev->degraded && ! mddev->ro) { + if (mddev->degraded && ! mddev->ro && !mddev->recovery_disabled) { list_for_each_entry(rdev, &mddev->disks, same_set) { if (rdev->raid_disk >= 0 && !test_bit(In_sync, &rdev->flags) && |