Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eece075c authored by Guoqing Jiang's avatar Guoqing Jiang Committed by NeilBrown
Browse files

md-cluster: only call complete(&cinfo->completion) when node join cluster 



Introduce MD_CLUSTER_BEGIN_JOIN_CLUSTER flag to make sure
complete(&cinfo->completion) is only be invoked when node
join cluster. Otherwise node failure could also call the
complete, and it doesn't make sense to do it.

Reviewed-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 6e6d9f2c

drivers/md/md-cluster.c

+10 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct resync_info { 
/* md_cluster_info flags */

#define		MD_CLUSTER_WAITING_FOR_NEWDISK		1

#define		MD_CLUSTER_SUSPEND_READ_BALANCING	2

#define		MD_CLUSTER_BEGIN_JOIN_CLUSTER		3





struct md_cluster_info {
@@ -320,10 +321,17 @@ static void recover_done(void *arg, struct dlm_slot *slots, 
	struct md_cluster_info *cinfo = mddev->cluster_info;



	cinfo->slot_number = our_slot;

	/* completion is only need to be complete when node join cluster,

	 * it doesn't need to run during another node's failure */

	if (test_bit(MD_CLUSTER_BEGIN_JOIN_CLUSTER, &cinfo->state)) {

		complete(&cinfo->completion);

		clear_bit(MD_CLUSTER_BEGIN_JOIN_CLUSTER, &cinfo->state);

	}

	clear_bit(MD_CLUSTER_SUSPEND_READ_BALANCING, &cinfo->state);

}



/* the ops is called when node join the cluster, and do lock recovery

 * if node failure occurs */

static const struct dlm_lockspace_ops md_ls_ops = {

	.recover_prep = recover_prep,

	.recover_slot = recover_slot,
@@ -675,6 +683,7 @@ static int join(struct mddev *mddev, int nodes) 
	INIT_LIST_HEAD(&cinfo->suspend_list);

	spin_lock_init(&cinfo->suspend_lock);

	init_completion(&cinfo->completion);

	set_bit(MD_CLUSTER_BEGIN_JOIN_CLUSTER, &cinfo->state);



	mutex_init(&cinfo->sb_mutex);

	mddev->cluster_info = cinfo;