Skip to content

Commit 24f8b57

Browse files
committed
md/md-cluster: handle REMOVE message earlier
JIRA: https://issues.redhat.com/browse/RHEL-94433 commit 948b1fe Author: Heming Zhao <heming.zhao@suse.com> Date: Mon Jul 28 12:21:40 2025 +0800 md/md-cluster: handle REMOVE message earlier Commit a1fd37f ("md: Don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl") introduced a regression in the md_cluster module. (Failed cases 02r1_Manage_re-add & 02r10_Manage_re-add) Consider a 2-node cluster: - node1 set faulty & remove command on a disk. - node2 must correctly update the array metadata. Before a1fd37f, on node1, the delay between msg:METADATA_UPDATED (triggered by faulty) and msg:REMOVE was sufficient for node2 to reload the disk info (written by node1). After a1fd37f, node1 no longer waits between faulty and remove, causing it to send msg:REMOVE while node2 is still reloading disk info. This often results in node2 failing to remove the faulty disk. == how to trigger == set up a 2-node cluster (node1 & node2) with disks vdc & vdd. on node1: mdadm -CR /dev/md0 -l1 -b clustered -n2 /dev/vdc /dev/vdd --assume-clean ssh node2-ip mdadm -A /dev/md0 /dev/vdc /dev/vdd mdadm --manage /dev/md0 --fail /dev/vdc --remove /dev/vdc check array status on both nodes with "mdadm -D /dev/md0". node1 output: Number Major Minor RaidDevice State - 0 0 0 removed 1 254 48 1 active sync /dev/vdd node2 output: Number Major Minor RaidDevice State - 0 0 0 removed 1 254 48 1 active sync /dev/vdd 0 254 32 - faulty /dev/vdc Fixes: a1fd37f ("md: Don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl") Signed-off-by: Heming Zhao <heming.zhao@suse.com> Reviewed-by: Su Yue <glass.su@suse.com> Link: https://lore.kernel.org/linux-raid/20250728042145.9989-1-heming.zhao@suse.com Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
1 parent 46b1d8b commit 24f8b57

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/md/md.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9803,8 +9803,8 @@ void md_check_recovery(struct mddev *mddev)
98039803
* remove disk.
98049804
*/
98059805
rdev_for_each_safe(rdev, tmp, mddev) {
9806-
if (test_and_clear_bit(ClusterRemove, &rdev->flags) &&
9807-
rdev->raid_disk < 0)
9806+
if (rdev->raid_disk < 0 &&
9807+
test_and_clear_bit(ClusterRemove, &rdev->flags))
98089808
md_kick_rdev_from_array(rdev);
98099809
}
98109810
}
@@ -10110,8 +10110,11 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)
1011010110

1011110111
/* Check for change of roles in the active devices */
1011210112
rdev_for_each_safe(rdev2, tmp, mddev) {
10113-
if (test_bit(Faulty, &rdev2->flags))
10113+
if (test_bit(Faulty, &rdev2->flags)) {
10114+
if (test_bit(ClusterRemove, &rdev2->flags))
10115+
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
1011410116
continue;
10117+
}
1011510118

1011610119
/* Check if the roles changed */
1011710120
role = le16_to_cpu(sb->dev_roles[rdev2->desc_nr]);

0 commit comments

Comments
 (0)