From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Jul 2018 15:36:38 +0000 (-0500)
Subject: messages/MMDSMap: fix reencoding for older clients
X-Git-Tag: v14.0.1~895^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=267d22639e9d28e4436203ed3bef2e4a67c53375;p=ceph.git

messages/MMDSMap: fix reencoding for older clients

This was broken by ea1481d08d561cdf0229e440b70b88fe336d3f89.

Fixes: http://tracker.ceph.com/issues/24819
Signed-off-by: Sage Weil <sage@redhat.com>
---

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);