From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Oct 2017 21:49:34 +0000 (-0500)
Subject: mon/OSDMonitor: assume peer handles osdmap forward requests
X-Git-Tag: v13.0.1~348^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ceb31ee68dde7872daa6a5d754a82350de3ac8d4;p=ceph.git

mon/OSDMonitor: assume peer handles osdmap forward requests

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 855cd30d4ad3..8d9231554232 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2918,8 +2918,7 @@ void OSDMonitor::send_incremental(MonOpRequestRef op, epoch_t first)
   MonSession *s = op->get_session();
   assert(s);
 
-  if (s->proxy_con &&
-      s->proxy_con->has_feature(CEPH_FEATURE_MON_ROUTE_OSDMAP)) {
+  if (s->proxy_con) {
     // oh, we can tell the other mon to do it
     dout(10) << __func__ << " asking proxying mon to send_incremental from "
 	     << first << dendl;