Commit a5cbd5fc authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph, ceph: get and handle cluster maps with addrvecs 



In preparation for msgr2, make the cluster send us maps with addrvecs
including both LEGACY and MSGR2 addrs instead of a single LEGACY addr.
This means advertising support for SERVER_NAUTILUS and also some older
features: SERVER_MIMIC, MONENC and MONNAMES.

MONNAMES and MONENC are actually pre-argonaut, we just never updated
ceph_monmap_decode() for them.  Decoding is unconditional, see commit
23c625ce ("libceph: assume argonaut on the server side").

SERVER_MIMIC doesn't bear any meaning for the kernel client.

Since ceph_decode_entity_addrvec() is guarded by encoding version
checks (and in msgr2 case it is guarded implicitly by the fact that
server is speaking msgr2), we assume MSG_ADDR2 for it.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 8921f251

fs/ceph/mds_client.c

+1 −1
Original line number Diff line number Diff line
@@ -5014,7 +5014,7 @@ void ceph_mdsc_handle_mdsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg) 
		return;

	}



	newmap = ceph_mdsmap_decode(&p, end);

	newmap = ceph_mdsmap_decode(&p, end, false);

	if (IS_ERR(newmap)) {

		err = PTR_ERR(newmap);

		goto bad_unlock;

fs/ceph/mdsmap.c

+11 −10
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ bad: 
 * Ignore any fields we don't care about (there are quite a few of

 * them).

 */

struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)

struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end, bool msgr2)

{

	struct ceph_mdsmap *m;

	const void *start = *p;
@@ -201,18 +201,19 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 
		namelen = ceph_decode_32(p);  /* skip mds name */

		*p += namelen;



		ceph_decode_need(p, end,

				 4*sizeof(u32) + sizeof(u64) +

				 sizeof(addr) + sizeof(struct ceph_timespec),

				 bad);

		mds = ceph_decode_32(p);

		inc = ceph_decode_32(p);

		state = ceph_decode_32(p);

		ceph_decode_32_safe(p, end, mds, bad);

		ceph_decode_32_safe(p, end, inc, bad);

		ceph_decode_32_safe(p, end, state, bad);

		*p += sizeof(u64);		/* state_seq */

		if (info_v >= 8)

			err = ceph_decode_entity_addrvec(p, end, msgr2, &addr);

		else

			err = ceph_decode_entity_addr(p, end, &addr);

		if (err)

			goto corrupt;

		ceph_decode_copy(p, &laggy_since, sizeof(laggy_since));



		ceph_decode_copy_safe(p, end, &laggy_since, sizeof(laggy_since),

				      bad);

		laggy = laggy_since.tv_sec != 0 || laggy_since.tv_nsec != 0;

		*p += sizeof(u32);

		ceph_decode_32_safe(p, end, namelen, bad);

include/linux/ceph/ceph_features.h

+8 −3
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
 * feature.  Base case is 1 (first use).

 */

#define CEPH_FEATURE_INCARNATION_1 (0ull)

#define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // CEPH_FEATURE_SERVER_JEWEL

#define CEPH_FEATURE_INCARNATION_2 (1ull<<57)              // SERVER_JEWEL

#define CEPH_FEATURE_INCARNATION_3 ((1ull<<57)|(1ull<<28)) // SERVER_MIMIC



#define DEFINE_CEPH_FEATURE(bit, incarnation, name)			\

	static const uint64_t __maybe_unused CEPH_FEATURE_##name = (1ULL<<bit);		\
@@ -75,7 +76,7 @@ 
DEFINE_CEPH_FEATURE( 0, 1, UID)

DEFINE_CEPH_FEATURE( 1, 1, NOSRCADDR)

DEFINE_CEPH_FEATURE_RETIRED( 2, 1, MONCLOCKCHECK, JEWEL, LUMINOUS)



DEFINE_CEPH_FEATURE( 2, 3, SERVER_NAUTILUS)

DEFINE_CEPH_FEATURE( 3, 1, FLOCK)

DEFINE_CEPH_FEATURE( 4, 1, SUBSCRIBE2)

DEFINE_CEPH_FEATURE( 5, 1, MONNAMES)
@@ -114,7 +115,7 @@ DEFINE_CEPH_FEATURE(25, 1, CRUSH_TUNABLES2) 
DEFINE_CEPH_FEATURE(26, 1, CREATEPOOLID)

DEFINE_CEPH_FEATURE(27, 1, REPLY_CREATE_INODE)

DEFINE_CEPH_FEATURE_RETIRED(28, 1, OSD_HBMSGS, HAMMER, JEWEL)

DEFINE_CEPH_FEATURE(28, 2, SERVER_M)

DEFINE_CEPH_FEATURE(28, 2, SERVER_MIMIC)

DEFINE_CEPH_FEATURE(29, 1, MDSENC)

DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL)

DEFINE_CEPH_FEATURE(31, 1, MON_SINGLE_PAXOS)  // deprecate me
@@ -177,13 +178,16 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin 
 */

#define CEPH_FEATURES_SUPPORTED_DEFAULT		\

	(CEPH_FEATURE_NOSRCADDR |		\

	 CEPH_FEATURE_SERVER_NAUTILUS |		\

	 CEPH_FEATURE_FLOCK |			\

	 CEPH_FEATURE_SUBSCRIBE2 |		\

	 CEPH_FEATURE_MONNAMES |		\

	 CEPH_FEATURE_RECONNECT_SEQ |		\

	 CEPH_FEATURE_DIRLAYOUTHASH |		\

	 CEPH_FEATURE_PGID64 |			\

	 CEPH_FEATURE_PGPOOL3 |			\

	 CEPH_FEATURE_OSDENC |			\

	 CEPH_FEATURE_MONENC |			\

	 CEPH_FEATURE_CRUSH_TUNABLES |		\

	 CEPH_FEATURE_SERVER_LUMINOUS |		\

	 CEPH_FEATURE_RESEND_ON_SPLIT |		\
@@ -193,6 +197,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin 
	 CEPH_FEATURE_MSG_AUTH |		\

	 CEPH_FEATURE_CRUSH_TUNABLES2 |		\

	 CEPH_FEATURE_REPLY_CREATE_INODE |	\

	 CEPH_FEATURE_SERVER_MIMIC |		\

	 CEPH_FEATURE_MDSENC |			\

	 CEPH_FEATURE_OSDHASHPSPOOL |		\

	 CEPH_FEATURE_OSD_CACHEPOOL |		\

include/linux/ceph/decode.h

+4 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ static inline void ceph_encode_timespec64(struct ceph_timespec *tv, 
 */

#define CEPH_ENTITY_ADDR_TYPE_NONE	0

#define CEPH_ENTITY_ADDR_TYPE_LEGACY	__cpu_to_le32(1)

#define CEPH_ENTITY_ADDR_TYPE_MSGR2	__cpu_to_le32(2)



static inline void ceph_encode_banner_addr(struct ceph_entity_addr *a)

{
@@ -239,6 +240,9 @@ static inline void ceph_decode_banner_addr(struct ceph_entity_addr *a) 


extern int ceph_decode_entity_addr(void **p, void *end,

				   struct ceph_entity_addr *addr);

int ceph_decode_entity_addrvec(void **p, void *end, bool msgr2,

			       struct ceph_entity_addr *addr);



/*

 * encoders

 */

include/linux/ceph/mdsmap.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline bool ceph_mdsmap_is_laggy(struct ceph_mdsmap *m, int w) 
}



extern int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m);

extern struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end);

struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end, bool msgr2);

extern void ceph_mdsmap_destroy(struct ceph_mdsmap *m);

extern bool ceph_mdsmap_is_cluster_available(struct ceph_mdsmap *m);

CRA Git | Maintained and supported by SUSTech CRA and CCSE