From 1893315baafef42a9d89e9794666ac7a91a7e485 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 2 Sep 2016 14:32:01 -0400
Subject: [PATCH] message/MMonMap: reencode MonMap for old (non-addr2) clients

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/messages/MMonMap.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h
index 808a7572d9c..63c8480fa4a 100644
--- a/src/messages/MMonMap.h
+++ b/src/messages/MMonMap.h
@@ -34,7 +34,9 @@ public:
   const char *get_type_name() const { return "mon_map"; }
 
   void encode_payload(uint64_t features) { 
-    if (monmapbl.length() && (features & CEPH_FEATURE_MONENC) == 0) {
+    if (monmapbl.length() &&
+	((features & CEPH_FEATURE_MONENC) == 0 ||
+	 (features & CEPH_FEATURE_MSG_ADDR2) == 0)) {
       // reencode old-format monmap
       MonMap t;
       t.decode(monmapbl);