mon/OSDMonitor: do not encode osdmap with MSG_ADDR2 until kraken flag is set

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index a661b291f2ee9e16eaf60456a7aa97558e2367df..670b16d92fa5d968f34ffa5f119aceea080abda9 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1233,8 +1233,10 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
       features &= ~CEPH_FEATURE_SERVER_JEWEL;
     }
     if (!tmp.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
-      dout(10) << __func__ << " encoding without feature SERVER_KRAKEN" << dendl;
-      features &= ~CEPH_FEATURE_SERVER_KRAKEN;
+      dout(10) << __func__ << " encoding without feature SERVER_KRAKEN | "
+              << "MSG_ADDR2" << dendl;
+      features &= ~(CEPH_FEATURE_SERVER_KRAKEN |
+                   CEPH_FEATURE_MSG_ADDR2);
     }
     dout(10) << __func__ << " encoding full map with " << features << dendl;