From 267d22639e9d28e4436203ed3bef2e4a67c53375 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 10 Jul 2018 10:36:38 -0500 Subject: [PATCH] messages/MMDSMap: fix reencoding for older clients This was broken by ea1481d08d561cdf0229e440b70b88fe336d3f89. Fixes: http://tracker.ceph.com/issues/24819 Signed-off-by: Sage Weil --- src/messages/MMDSMap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h index 8729d4fb7066f..fea57ee7a22db 100644 --- a/src/messages/MMDSMap.h +++ b/src/messages/MMDSMap.h @@ -62,7 +62,8 @@ public: encode(epoch, payload); if ((features & CEPH_FEATURE_PGID64) == 0 || (features & CEPH_FEATURE_MDSENC) == 0 || - (features & CEPH_FEATURE_MSG_ADDR2) == 0) { + (features & CEPH_FEATURE_MSG_ADDR2) == 0 || + !HAVE_FEATURE(features, SERVER_NAUTILUS)) { // reencode for old clients. MDSMap m; m.decode(encoded); -- 2.39.5