OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] md: make messages about resync/recovery etc more specific 

It is possible to request a 'check' of an md/raid array where the whole array
is read and consistancies are reported.

This uses the same mechanisms as 'resync' and so reports in the kernel logs
that a resync is being started.  This understandably confuses/worries people.

Also the text in /proc/mdstat suggests a 'resync' is happen when it is just a
check.

This patch changes those messages to be more specific about what is happening.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown 2006-10-03 01:15:57 -07:00 committed by Linus Torvalds
parent f022b2fddd
commit 61df9d91e9
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/md/md.c
View File

@ -4641,9 +4641,11 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)
seq_printf(seq, " %s =%3u.%u%% (%llu/%llu)", seq_printf(seq, " %s =%3u.%u%% (%llu/%llu)",
(test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)? (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)?
"reshape" : "reshape" :
(test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ? (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)?
"resync" : "recovery")), "check" :
per_milli/10, per_milli % 10, (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ?
"resync" : "recovery"))),
per_milli/10, per_milli % 10,
(unsigned long long) resync, (unsigned long long) resync,
(unsigned long long) max_blocks); (unsigned long long) max_blocks);
@ -5032,6 +5034,7 @@ void md_do_sync(mddev_t *mddev)
int skipped = 0; int skipped = 0;
struct list_head *rtmp; struct list_head *rtmp;
mdk_rdev_t *rdev; mdk_rdev_t *rdev;
char *desc;
/* just incase thread restarts... */ /* just incase thread restarts... */
if (test_bit(MD_RECOVERY_DONE, &mddev->recovery)) if (test_bit(MD_RECOVERY_DONE, &mddev->recovery))
@ -5039,6 +5042,18 @@ void md_do_sync(mddev_t *mddev)
if (mddev->ro) /* never try to sync a read-only array */ if (mddev->ro) /* never try to sync a read-only array */
return; return;
if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery))
desc = "data-check";
else if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
desc = "requested-resync";
else
desc = "resync";
} else if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery))
desc = "reshape";
else
desc = "recovery";
/* we overload curr_resync somewhat here. /* we overload curr_resync somewhat here.
* 0 == not engaged in resync at all * 0 == not engaged in resync at all
* 2 == checking that there is no conflict with another sync * 2 == checking that there is no conflict with another sync
@ -5082,10 +5097,10 @@ void md_do_sync(mddev_t *mddev)
prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE); prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE);
if (!kthread_should_stop() && if (!kthread_should_stop() &&
mddev2->curr_resync >= mddev->curr_resync) { mddev2->curr_resync >= mddev->curr_resync) {
printk(KERN_INFO "md: delaying resync of %s" printk(KERN_INFO "md: delaying %s of %s"
" until %s has finished resync (they" " until %s has finished (they"
" share one or more physical units)\n", " share one or more physical units)\n",
mdname(mddev), mdname(mddev2)); desc, mdname(mddev), mdname(mddev2));
mddev_put(mddev2); mddev_put(mddev2);
schedule(); schedule();
finish_wait(&resync_wait, &wq); finish_wait(&resync_wait, &wq);
@ -5121,12 +5136,12 @@ void md_do_sync(mddev_t *mddev)
j = rdev->recovery_offset; j = rdev->recovery_offset;
} }
printk(KERN_INFO "md: syncing RAID array %s\n", mdname(mddev)); printk(KERN_INFO "md: %s of RAID array %s\n", desc, mdname(mddev));
printk(KERN_INFO "md: minimum _guaranteed_ reconstruction speed:" printk(KERN_INFO "md: minimum _guaranteed_ speed:"
" %d KB/sec/disc.\n", speed_min(mddev)); " %d KB/sec/disk.\n", speed_min(mddev));
printk(KERN_INFO "md: using maximum available idle IO bandwidth " printk(KERN_INFO "md: using maximum available idle IO bandwidth "
"(but not more than %d KB/sec) for reconstruction.\n", "(but not more than %d KB/sec) for %s.\n",
speed_max(mddev)); speed_max(mddev), desc);
is_mddev_idle(mddev); /* this also initializes IO event counters */ is_mddev_idle(mddev); /* this also initializes IO event counters */
@ -5152,8 +5167,8 @@ void md_do_sync(mddev_t *mddev)
if (j>2) { if (j>2) {
printk(KERN_INFO printk(KERN_INFO
"md: resuming recovery of %s from checkpoint.\n", "md: resuming %s of %s from checkpoint.\n",
mdname(mddev)); desc, mdname(mddev));
mddev->curr_resync = j; mddev->curr_resync = j;
} }
@ -5236,7 +5251,7 @@ void md_do_sync(mddev_t *mddev)
} }
} }
} }
printk(KERN_INFO "md: %s: sync done.\n",mdname(mddev)); printk(KERN_INFO "md: %s: %s done.\n",mdname(mddev), desc);
/* /*
* this also signals 'finished resyncing' to md_stop * this also signals 'finished resyncing' to md_stop
*/ */
@ -5256,8 +5271,8 @@ void md_do_sync(mddev_t *mddev)
if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) { if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
if (mddev->curr_resync >= mddev->recovery_cp) { if (mddev->curr_resync >= mddev->recovery_cp) {
printk(KERN_INFO printk(KERN_INFO
"md: checkpointing recovery of %s.\n", "md: checkpointing %s of %s.\n",
mdname(mddev)); desc, mdname(mddev));
mddev->recovery_cp = mddev->curr_resync; mddev->recovery_cp = mddev->curr_resync;
} }
} else } else