From: Sage Weil <sage@redhat.com>
Date: Fri, 30 Sep 2016 22:28:42 +0000 (-0400)
Subject: mon/OSDMonitor: do not encode osdmap with MSG_ADDR2 until kraken flag is set
X-Git-Tag: v11.1.0~515^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9825%2Fhead;p=ceph.git

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 a661b291f2e..670b16d92fa 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;