msg: drop pointless specification of supported features

Whatever we specify is OR'd onto CEPH_FEATURE_SUPPORTED_DEFAULT (which is
all features) in the Policy() ctor.  This argument is pointless.

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

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 4ba914b2d1894354608f5b6cdaa0979cb09ae74e..7bde9ee10e8e268c0ff973ea5c9e0fd0f0e41227 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -153,28 +153,19 @@ int main(int argc, const char **argv)
 
   cout << "starting " << g_conf->name << " at " << msgr->get_myaddr()
        << std::endl;
-  uint64_t supported =
-    CEPH_FEATURE_UID |
-    CEPH_FEATURE_NOSRCADDR |
-    CEPH_FEATURE_DIRLAYOUTHASH |
-    CEPH_FEATURE_MDS_INLINE_DATA |
-    CEPH_FEATURE_PGID64 |
-    CEPH_FEATURE_MSG_AUTH |
-    CEPH_FEATURE_EXPORT_PEER |
-    CEPH_FEATURE_MDS_QUOTA;
   uint64_t required =
     CEPH_FEATURE_OSDREPLYMUX;
 
-  msgr->set_default_policy(Messenger::Policy::lossy_client(supported, required));
+  msgr->set_default_policy(Messenger::Policy::lossy_client(0, required));
   msgr->set_policy(entity_name_t::TYPE_MON,
-                   Messenger::Policy::lossy_client(supported,
+                   Messenger::Policy::lossy_client(0,
                                                    CEPH_FEATURE_UID |
                                                    CEPH_FEATURE_PGID64));
   msgr->set_policy(entity_name_t::TYPE_MDS,
-                   Messenger::Policy::lossless_peer(supported,
+                   Messenger::Policy::lossless_peer(0,
                                                     CEPH_FEATURE_UID));
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
-                   Messenger::Policy::stateful_server(supported, 0));
+                   Messenger::Policy::stateful_server(0, 0));
 
   int r = msgr->bind(g_conf->public_addr);
   if (r < 0)

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index ca746ac5e18be0f14674588539333dca2a146348..818171478b234a50c5acacb5887dea7b65c5a700 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -660,27 +660,22 @@ int main(int argc, const char **argv)
   msgr->set_cluster_protocol(CEPH_MON_PROTOCOL);
   msgr->set_default_send_priority(CEPH_MSG_PRIO_HIGH);
 
-  uint64_t supported =
-    CEPH_FEATURE_UID |
-    CEPH_FEATURE_NOSRCADDR |
-    CEPH_FEATURE_PGID64 |
-    CEPH_FEATURE_MSG_AUTH;
-  msgr->set_default_policy(Messenger::Policy::stateless_server(supported, 0));
+  msgr->set_default_policy(Messenger::Policy::stateless_server(0, 0));
   msgr->set_policy(entity_name_t::TYPE_MON,
                    Messenger::Policy::lossless_peer_reuse(
-                       supported,
-                       CEPH_FEATURE_UID |
-                       CEPH_FEATURE_PGID64 |
-                       CEPH_FEATURE_MON_SINGLE_PAXOS));
+                    0,
+                    CEPH_FEATURE_UID |
+                    CEPH_FEATURE_PGID64 |
+                    CEPH_FEATURE_MON_SINGLE_PAXOS));
   msgr->set_policy(entity_name_t::TYPE_OSD,
                    Messenger::Policy::stateless_server(
-                       supported,
-                       CEPH_FEATURE_PGID64 |
-                       CEPH_FEATURE_OSDENC));
+                    0,
+                    CEPH_FEATURE_PGID64 |
+                    CEPH_FEATURE_OSDENC));
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
-                   Messenger::Policy::stateless_server(supported, 0));
+                   Messenger::Policy::stateless_server(0, 0));
   msgr->set_policy(entity_name_t::TYPE_MDS,
-                   Messenger::Policy::stateless_server(supported, 0));
+                   Messenger::Policy::stateless_server(0, 0));
 
   // throttle client traffic
   Throttle *client_throttler = new Throttle(g_ceph_context, "mon_client_bytes",

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 3565e2496798e68a30b1287545761b98ef57f8f0..7f49d00883e56c220750298a275fc6abdc8fb077 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -491,30 +491,23 @@ flushjournal_out:
     new Throttle(g_ceph_context, "osd_client_messages",
                 g_conf->osd_client_message_cap));
 
-  uint64_t supported =
-    CEPH_FEATURE_UID | 
-    CEPH_FEATURE_NOSRCADDR |
-    CEPH_FEATURE_PGID64 |
-    CEPH_FEATURE_MSG_AUTH |
-    CEPH_FEATURE_OSD_ERASURE_CODES;
-
   // All feature bits 0 - 34 should be present from dumpling v0.67 forward
   uint64_t osd_required =
     CEPH_FEATURE_UID |
     CEPH_FEATURE_PGID64 |
     CEPH_FEATURE_OSDENC;
 
-  ms_public->set_default_policy(Messenger::Policy::stateless_server(supported, 0));
+  ms_public->set_default_policy(Messenger::Policy::stateless_server(0, 0));
   ms_public->set_policy_throttlers(entity_name_t::TYPE_CLIENT,
                                   client_byte_throttler.get(),
                                   client_msg_throttler.get());
   ms_public->set_policy(entity_name_t::TYPE_MON,
-                               Messenger::Policy::lossy_client(supported,
+                               Messenger::Policy::lossy_client(0,
                                                               CEPH_FEATURE_UID |
                                                               CEPH_FEATURE_PGID64 |
                                                               CEPH_FEATURE_OSDENC));
   ms_public->set_policy(entity_name_t::TYPE_MGR,
-                               Messenger::Policy::lossy_client(supported,
+                               Messenger::Policy::lossy_client(0,
                                                               CEPH_FEATURE_UID |
                                                               CEPH_FEATURE_PGID64 |
                                                               CEPH_FEATURE_OSDENC));
@@ -526,8 +519,7 @@ flushjournal_out:
   ms_cluster->set_default_policy(Messenger::Policy::stateless_server(0, 0));
   ms_cluster->set_policy(entity_name_t::TYPE_MON, Messenger::Policy::lossy_client(0,0));
   ms_cluster->set_policy(entity_name_t::TYPE_OSD,
-                        Messenger::Policy::lossless_peer(supported,
-                                                         osd_required));
+                        Messenger::Policy::lossless_peer(0, osd_required));
   ms_cluster->set_policy(entity_name_t::TYPE_CLIENT,
                         Messenger::Policy::stateless_server(0, 0));
 

diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index 309dcf636eff10bf98edc3994b34abe80cf04542..baffc5faf7190a1dfd6171400614aaf36f43c606 100644 (file)
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -367,17 +367,13 @@ class OSDStub : public TestStub
 
     Throttle throttler(g_ceph_context, "osd_client_bytes",
        g_conf->osd_client_message_size_cap);
-    uint64_t supported =
-      CEPH_FEATURE_UID |
-      CEPH_FEATURE_NOSRCADDR |
-      CEPH_FEATURE_PGID64;
 
     messenger->set_default_policy(
-       Messenger::Policy::stateless_server(supported, 0));
+       Messenger::Policy::stateless_server(0, 0));
     messenger->set_policy_throttlers(entity_name_t::TYPE_CLIENT,
                                    &throttler, NULL);
     messenger->set_policy(entity_name_t::TYPE_MON,
-       Messenger::Policy::lossy_client(supported, CEPH_FEATURE_UID |
+       Messenger::Policy::lossy_client(0, CEPH_FEATURE_UID |
          CEPH_FEATURE_PGID64 |
          CEPH_FEATURE_OSDENC));
     messenger->set_policy(entity_name_t::TYPE_OSD,