Commit 9744197c authored by NeilBrown's avatar NeilBrown

md: Don't wait UNINTERRUPTIBLE for other resync to finish

When two md arrays share some block device (e.g each uses different
partitions on the one device), a resync of one array will wait for
the resync on the other to finish.

This can be a long time and as it currently waits TASK_UNINTERRUPTIBLE,
the softlockup code notices and complains.

So use TASK_INTERRUPTIBLE instead and make sure to flush signals
before calling schedule.
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 45e9c0de
...@@ -5761,7 +5761,11 @@ void md_do_sync(mddev_t *mddev) ...@@ -5761,7 +5761,11 @@ void md_do_sync(mddev_t *mddev)
* time 'round when curr_resync == 2 * time 'round when curr_resync == 2
*/ */
continue; continue;
prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE); /* We need to wait 'interruptible' so as not to
* contribute to the load average, and not to
* be caught by 'softlockup'
*/
prepare_to_wait(&resync_wait, &wq, TASK_INTERRUPTIBLE);
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 %s of %s" printk(KERN_INFO "md: delaying %s of %s"
...@@ -5769,6 +5773,8 @@ void md_do_sync(mddev_t *mddev) ...@@ -5769,6 +5773,8 @@ void md_do_sync(mddev_t *mddev)
" share one or more physical units)\n", " share one or more physical units)\n",
desc, mdname(mddev), mdname(mddev2)); desc, mdname(mddev), mdname(mddev2));
mddev_put(mddev2); mddev_put(mddev2);
if (signal_pending(current))
flush_signals(current);
schedule(); schedule();
finish_wait(&resync_wait, &wq); finish_wait(&resync_wait, &wq);
goto try_again; goto try_again;
......
Markdown is supported
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