]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
md-cluster: don't send msg if array is closing
authorGuoqing Jiang <gqjiang@suse.com>
Mon, 2 Jul 2018 08:26:26 +0000 (16:26 +0800)
committerShaohua Li <shli@fb.com>
Thu, 5 Jul 2018 18:17:02 +0000 (11:17 -0700)
If we close an array which resync thread is running,
then we don't need the node to send msg since another
node would launch the resync thread to continue the
rest works. Also send a message is time consuming,
we should avoid it.

Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
drivers/md/md-cluster.c

index 5ed13c4fe72d52c772d35f6bb170174c074fc444..e8a74e92be3060d6978e1ec085499cf7a40d38f2 100644 (file)
@@ -1281,7 +1281,15 @@ static int resync_finish(struct mddev *mddev)
 
        clear_bit(MD_RESYNCING_REMOTE, &mddev->recovery);
        dlm_unlock_sync(cinfo->resync_lockres);
-       return resync_info_update(mddev, 0, 0);
+
+       /*
+        * If resync thread is interrupted so we can't say resync is finished,
+        * another node will launch resync thread to continue.
+        */
+       if (test_bit(MD_CLOSING, &mddev->flags))
+               return 0;
+       else
+               return resync_info_update(mddev, 0, 0);
 }
 
 static int area_resyncing(struct mddev *mddev, int direction,