diff options
| author | NeilBrown <neilb@suse.com> | 2015-07-24 05:27:08 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-08-31 19:38:17 +0200 |
| commit | 5ed1df2eacc0ba92c8c7e2499c97594b5ef928a8 (patch) | |
| tree | d712ddbdc3bfcbc710f6823076691e96f197baf7 /drivers/md/md.c | |
| parent | md: be careful when testing resync_max against curr_resync_completed. (diff) | |
| download | linux-5ed1df2eacc0ba92c8c7e2499c97594b5ef928a8.tar.xz linux-5ed1df2eacc0ba92c8c7e2499c97594b5ef928a8.zip | |
md: sync sync_completed has correct value as recovery finishes.
There can be a small window between the moment that recovery
actually writes the last block and the time when various sysfs
and /proc/mdstat attributes report that it has finished.
During this time, 'sync_completed' can have the wrong value.
This can confuse monitoring software.
So:
- don't set curr_resync_completed beyond the end of the devices,
- set it correctly when resync/recovery has completed.
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/md.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index b326cd26b027..84dc5d7a445b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7880,6 +7880,9 @@ void md_do_sync(struct md_thread *thread) break; j += sectors; + if (j > max_sectors) + /* when skipping, extra large numbers can be returned. */ + j = max_sectors; if (j > 2) mddev->curr_resync = j; if (mddev_is_clustered(mddev)) @@ -7948,6 +7951,12 @@ void md_do_sync(struct md_thread *thread) blk_finish_plug(&plug); wait_event(mddev->recovery_wait, !atomic_read(&mddev->recovery_active)); + if (!test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) && + !test_bit(MD_RECOVERY_INTR, &mddev->recovery) && + mddev->curr_resync > 2) { + mddev->curr_resync_completed = mddev->curr_resync; + sysfs_notify(&mddev->kobj, NULL, "sync_completed"); + } /* tell personality that we are finished */ mddev->pers->sync_request(mddev, max_sectors, &skipped); |