ceph: don't blindly unregister session that is in opening state (6f0f597b) · Commits · 戴 / test

fs/ceph/mds_client.c

+26 −33

Original line number	Diff line number	Diff line
		@@ -3737,23 +3737,11 @@ static void check_new_map(struct ceph_mds_client *mdsc,
		ceph_mdsmap_is_laggy(newmap, i) ? " (laggy)" : "",
		ceph_session_state_name(s->s_state));

		if (i >= newmap->m_num_mds \|\|
		memcmp(ceph_mdsmap_get_addr(oldmap, i),
		ceph_mdsmap_get_addr(newmap, i),
		sizeof(struct ceph_entity_addr))) {
		if (s->s_state == CEPH_MDS_SESSION_OPENING) {
		/* the session never opened, just close it
		* out now */
		get_session(s);
		__unregister_session(mdsc, s);
		__wake_requests(mdsc, &s->s_waiting);
		ceph_put_mds_session(s);
		} else if (i >= newmap->m_num_mds) {
		if (i >= newmap->m_num_mds) {
		/* force close session for stopped mds */
		get_session(s);
		__unregister_session(mdsc, s);
		__wake_requests(mdsc, &s->s_waiting);
		kick_requests(mdsc, i);
		mutex_unlock(&mdsc->mutex);

		mutex_lock(&s->s_mutex);
		@@ -3764,7 +3752,13 @@ static void check_new_map(struct ceph_mds_client *mdsc,
		ceph_put_mds_session(s);

		mutex_lock(&mdsc->mutex);
		} else {
		kick_requests(mdsc, i);
		continue;
		}

		if (memcmp(ceph_mdsmap_get_addr(oldmap, i),
		ceph_mdsmap_get_addr(newmap, i),
		sizeof(struct ceph_entity_addr))) {
		/* just close it */
		mutex_unlock(&mdsc->mutex);
		mutex_lock(&s->s_mutex);
		@@ -3772,7 +3766,6 @@ static void check_new_map(struct ceph_mds_client *mdsc,
		ceph_con_close(&s->s_con);
		mutex_unlock(&s->s_mutex);
		s->s_state = CEPH_MDS_SESSION_RESTARTING;
		}
		} else if (oldstate == newstate) {
		continue; /* nothing new with this mds */
		}