From f0cf281900fc391ea6fc151a2798cd80f399751f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 2 Sep 2016 14:36:55 -0400
Subject: [PATCH] message/MMonProbe: reencode monmap for non-addr2 clients

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

diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h
index 2f8a60b347c..abe53a0bc08 100644
--- a/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@ -90,7 +90,9 @@ public:
   }
   
   void encode_payload(uint64_t features) {
-    if (monmap_bl.length() && (features & CEPH_FEATURE_MONENC) == 0) {
+    if (monmap_bl.length() &&
+	((features & CEPH_FEATURE_MONENC) == 0 ||
+	 (features & CEPH_FEATURE_MSG_ADDR2) == 0)) {
       // reencode old-format monmap
       MonMap t;
       t.decode(monmap_bl);
-- 
2.47.3