Commit d01552a7 authored by NeilBrown's avatar NeilBrown
Browse files

Revert "md: allow a partially recovered device to be hot-added to an array."

This reverts commit 7eb41885


This commit is poorly justified, I can find not discusison in email,
and it clearly causes a problem.

If a device which is being recovered fails and is subsequently
re-added to an array, there could easily have been changes to the
array *before* the point where the recovery was up to.  So the
recovery must start again from the beginning.

If a spare is being recovered and fails, then when it is re-added we
really should do a bitmap-based recovery up to the recovery-offset,
and then a full recovery from there.  Before this reversion, we only
did the "full recovery from there" which is not corect.  After this
reversion with will do a full recovery from the start, which is safer
but not ideal.

It will be left to a future patch to arrange the two different styles
of recovery.
Reported-and-tested-by: default avatarNate Dailey <>
Signed-off-by: default avatarNeilBrown <>
Cc: (3.14+)
Fixes: 7eb41885 ("md: allow a partially recovered device to be hot-added to an array.")
parent b8a9d66d
......@@ -8040,8 +8040,7 @@ static int remove_and_add_spares(struct mddev *mddev,
!test_bit(Bitmap_sync, &rdev->flags)))
if (rdev->saved_raid_disk < 0)
rdev->recovery_offset = 0;
rdev->recovery_offset = 0;
if (mddev->pers->
hot_add_disk(mddev, rdev) == 0) {
if (sysfs_link_rdev(mddev, rdev))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment