Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7851be7 authored by NeilBrown's avatar NeilBrown
Browse files

md: Keep /proc/mdstat reporting recovery until fully DONE. 



Currently when a recovery completes, mdstat shows that it has finished
before the new device is marked as a full member.  Because of this it
can appear to a script that the recovery finished but the array isn't
in sync.

So while MD_RECOVERY_DONE is still set, keep mdstat reporting "recovery".
Once md_reap_sync_thread() completes, the spare will be active and then
MD_RECOVERY_DONE will be cleared.

To ensure this is race-free, set MD_RECOVERY_DONE before clearning
curr_resync.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 0e833e69

drivers/md/md.c

+24 −14
Original line number Diff line number Diff line
@@ -7093,7 +7093,7 @@ static void status_unused(struct seq_file *seq) 
	seq_printf(seq, "\n");

}



static void status_resync(struct seq_file *seq, struct mddev *mddev)

static int status_resync(struct seq_file *seq, struct mddev *mddev)

{

	sector_t max_sectors, resync, res;

	unsigned long dt, db;
@@ -7101,18 +7101,32 @@ static void status_resync(struct seq_file *seq, struct mddev *mddev) 
	int scale;

	unsigned int per_milli;



	if (mddev->curr_resync <= 3)

		resync = 0;

	else

		resync = mddev->curr_resync

			- atomic_read(&mddev->recovery_active);



	if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ||

	    test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery))

		max_sectors = mddev->resync_max_sectors;

	else

		max_sectors = mddev->dev_sectors;



	resync = mddev->curr_resync;

	if (resync <= 3) {

		if (test_bit(MD_RECOVERY_DONE, &mddev->recovery))

			/* Still cleaning up */

			resync = max_sectors;

	} else

		resync -= atomic_read(&mddev->recovery_active);



	if (resync == 0) {

		if (mddev->recovery_cp < MaxSector) {

			seq_printf(seq, "\tresync=PENDING");

			return 1;

		}

		return 0;

	}

	if (resync < 3) {

		seq_printf(seq, "\tresync=DELAYED");

		return 1;

	}



	WARN_ON(max_sectors == 0);

	/* Pick 'scale' such that (resync>>scale)*1000 will fit

	 * in a sector_t, and (max_sectors>>scale) will fit in a
@@ -7177,6 +7191,7 @@ static void status_resync(struct seq_file *seq, struct mddev *mddev) 
		   ((unsigned long)rt % 60)/6);



	seq_printf(seq, " speed=%ldK/sec", db/2/dt);

	return 1;

}



static void *md_seq_start(struct seq_file *seq, loff_t *pos)
@@ -7322,13 +7337,8 @@ static int md_seq_show(struct seq_file *seq, void *v) 
			mddev->pers->status(seq, mddev);

			seq_printf(seq, "\n      ");

			if (mddev->pers->sync_request) {

				if (mddev->curr_resync > 2) {

					status_resync(seq, mddev);

				if (status_resync(seq, mddev))

					seq_printf(seq, "\n      ");

				} else if (mddev->curr_resync >= 1)

					seq_printf(seq, "\tresync=DELAYED\n      ");

				else if (mddev->recovery_cp < MaxSector)

					seq_printf(seq, "\tresync=PENDING\n      ");

			}

		} else

			seq_printf(seq, "\n       ");
@@ -7979,11 +7989,11 @@ void md_do_sync(struct md_thread *thread) 
		mddev->resync_max = MaxSector;

	} else if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))

		mddev->resync_min = mddev->curr_resync_completed;

	set_bit(MD_RECOVERY_DONE, &mddev->recovery);

	mddev->curr_resync = 0;

	spin_unlock(&mddev->lock);



	wake_up(&resync_wait);

	set_bit(MD_RECOVERY_DONE, &mddev->recovery);

	md_wakeup_thread(mddev->thread);

	return;

}