History

md: make sure MD_RECOVERY_DONE is clear before starting recovery/resync

MD_RECOVERY_DONE is normally cleared by md_check_recovery after a resync etc finished. However it is possible for raid5_start_reshape to race and start a reshape before MD_RECOVERY_DONE is cleared. This can lean to multiple reshapes running at the same time, which isn't good. To make sure it is cleared before starting a reshape, and also clear it when reaping a thread, just to be safe.

NeilBrown committed 11 years ago

Commit ea358cd1 parent 8e8e2513 files · +3 −0Browse files

Unified · Split

3 files
  1. drivers/md/md.c +1 −0
  2. drivers/md/raid10.c +1 −0
  3. drivers/md/raid5.c +1 −0
drivers/md/md.c+1−0
@@ -8262,6 +8262,7 @@ void md_reap_sync_thread(struct mddev *mddev) · 8261 unmodified lines
82628262 if (mddev_is_clustered(mddev))
82638263 md_cluster_ops->metadata_update_finish(mddev);
82648264 clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
8265+ clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
82658266 clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
82668267 clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
82678268 clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
drivers/md/raid10.c+1−0
@@ -4156,6 +4156,7 @@ static int raid10_start_reshape(struct mddev *mddev) · 4155 unmodified lines
41564156
41574157 clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
41584158 clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
4159+ clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
41594160 set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
41604161 set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
41614162
drivers/md/raid5.c+1−0
@@ -7354,6 +7354,7 @@ static int raid5_start_reshape(struct mddev *mddev) · 7353 unmodified lines
73547354
73557355 clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
73567356 clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
7357+ clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
73577358 set_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
73587359 set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
73597360 mddev->sync_thread = md_register_thread(md_do_sync, mddev,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t