Commit d095559c authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: flush mdlog before umounting 



Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 59b312f3

fs/ceph/mds_client.c

+25 −0
Original line number Diff line number Diff line
@@ -4693,6 +4693,30 @@ static void wait_requests(struct ceph_mds_client *mdsc) 
	dout("wait_requests done\n");

}



void send_flush_mdlog(struct ceph_mds_session *s)

{

	struct ceph_msg *msg;



	/*

	 * Pre-luminous MDS crashes when it sees an unknown session request

	 */

	if (!CEPH_HAVE_FEATURE(s->s_con.peer_features, SERVER_LUMINOUS))

		return;



	mutex_lock(&s->s_mutex);

	dout("request mdlog flush to mds%d (%s)s seq %lld\n", s->s_mds,

	     ceph_session_state_name(s->s_state), s->s_seq);

	msg = ceph_create_session_msg(CEPH_SESSION_REQUEST_FLUSH_MDLOG,

				      s->s_seq);

	if (!msg) {

		pr_err("failed to request mdlog flush to mds%d (%s) seq %lld\n",

		       s->s_mds, ceph_session_state_name(s->s_state), s->s_seq);

	} else {

		ceph_con_send(&s->s_con, msg);

	}

	mutex_unlock(&s->s_mutex);

}



/*

 * called before mount is ro, and before dentries are torn down.

 * (hmm, does this still race with new lookups?)
@@ -4702,6 +4726,7 @@ void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc) 
	dout("pre_umount\n");

	mdsc->stopping = 1;



	ceph_mdsc_iterate_sessions(mdsc, send_flush_mdlog, true);

	ceph_mdsc_iterate_sessions(mdsc, lock_unlock_session, false);

	ceph_flush_dirty_caps(mdsc);

	wait_requests(mdsc);

fs/ceph/mds_client.h

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ static inline void ceph_mdsc_put_request(struct ceph_mds_request *req) 
	kref_put(&req->r_kref, ceph_mdsc_release_request);

}



extern void send_flush_mdlog(struct ceph_mds_session *s);

extern void ceph_mdsc_iterate_sessions(struct ceph_mds_client *mdsc,

				       void (*cb)(struct ceph_mds_session *),

				       bool check_state);

fs/ceph/strings.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ const char *ceph_session_op_name(int op) 
	case CEPH_SESSION_FLUSHMSG_ACK: return "flushmsg_ack";

	case CEPH_SESSION_FORCE_RO: return "force_ro";

	case CEPH_SESSION_REJECT: return "reject";

	case CEPH_SESSION_REQUEST_FLUSH_MDLOG: return "flush_mdlog";

	}

	return "???";

}

include/linux/ceph/ceph_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ enum { 
	CEPH_SESSION_FLUSHMSG_ACK,

	CEPH_SESSION_FORCE_RO,

	CEPH_SESSION_REJECT,

	CEPH_SESSION_REQUEST_FLUSH_MDLOG,

};



extern const char *ceph_session_op_name(int op);