From f62d33c54c1e6013d5887f9f994afa8eca355cf2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 30 Sep 2016 18:28:42 -0400 Subject: [PATCH] mon/OSDMonitor: do not encode osdmap with MSG_ADDR2 until kraken flag is set Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index a661b291f2ee9..670b16d92fa5d 100644 --- 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; -- 2.39.5