From: Samuel Just <sjust@redhat.com>
Date: Mon, 14 Mar 2016 22:24:57 +0000 (-0700)
Subject: features: deprecate CEPH_FEATURE_MON_NULLROUTE
X-Git-Tag: v10.1.0~17^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a62b0322dd54d91086bc73987be792660ca3417;p=ceph.git

features: deprecate CEPH_FEATURE_MON_NULLROUTE

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index a078f4a5de34..ff8b4fce5200 100755
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -30,7 +30,7 @@
 #define DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP   (1ULL<<17) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_CRUSH_TUNABLES (1ULL<<18)
 #define DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB (1ULL<<19) // DEPRECATED: JEWEL
-#define CEPH_FEATURE_MON_NULLROUTE  (1ULL<<20)
+#define DEPRECATED_CEPH_FEATURE_MON_NULLROUTE  (1ULL<<20) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_MON_GV         (1ULL<<21)
 #define CEPH_FEATURE_BACKFILL_RESERVATION (1ULL<<22)
 #define CEPH_FEATURE_MSG_AUTH	    (1ULL<<23)
@@ -134,7 +134,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
 	 DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP |	 \
 	 CEPH_FEATURE_CRUSH_TUNABLES |	 \
 	 DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB | \
-	 CEPH_FEATURE_MON_NULLROUTE |	 \
+	 DEPRECATED_CEPH_FEATURE_MON_NULLROUTE |	 \
 	 CEPH_FEATURE_MON_GV |		 \
 	 CEPH_FEATURE_BACKFILL_RESERVATION | \
 	 CEPH_FEATURE_MSG_AUTH |	     \
diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index 109574e87110..a31243c1476b 100644
--- a/src/messages/MRoute.h
+++ b/src/messages/MRoute.h
@@ -73,13 +73,6 @@ public:
   void encode_payload(uint64_t features) {
     ::encode(session_mon_tid, payload);
     ::encode(dest, payload);
-    if ((features & CEPH_FEATURE_MON_NULLROUTE) == 0) {
-      header.version = 1;
-      header.compat_version = 1;
-      assert(msg);
-      encode_message(msg, features, payload);
-      return;
-    }
     bool m = msg ? true : false;
     ::encode(m, payload);
     if (msg)
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index ceea9f1ce1b7..5911cdbf3256 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3254,19 +3254,11 @@ void Monitor::no_reply(MonOpRequestRef op)
   Message *req = op->get_req();
 
   if (session->proxy_con) {
-    if (get_quorum_features() & CEPH_FEATURE_MON_NULLROUTE) {
-      dout(10) << "no_reply to " << req->get_source_inst()
-	       << " via " << session->proxy_con->get_peer_addr()
-	       << " for request " << *req << dendl;
-      session->proxy_con->send_message(new MRoute(session->proxy_tid, NULL));
-      op->mark_event("no_reply: send routed request");
-    } else {
-      dout(10) << "no_reply no quorum nullroute feature for "
-               << req->get_source_inst()
-	       << " via " << session->proxy_con->get_peer_addr()
-	       << " for request " << *req << dendl;
-      op->mark_event("no_reply: no quorum support");
-    }
+    dout(10) << "no_reply to " << req->get_source_inst()
+	     << " via " << session->proxy_con->get_peer_addr()
+	     << " for request " << *req << dendl;
+    session->proxy_con->send_message(new MRoute(session->proxy_tid, NULL));
+    op->mark_event("no_reply: send routed request");
   } else {
     dout(10) << "no_reply to " << req->get_source_inst()
              << " " << *req << dendl;