msg/Messenger: drop useless 'supported' arg to Policy ctor

We always use CEPH_FEATURES_DEFAULT_SUPPORTED (= CEPH_FEATURES_ALL) here.

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

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 824be1272d5b54267fd55fbbb30ce1f72e0223e6..935c5f7e0390cd15431575e340f863941569fb3c 100644 (file)
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -209,9 +209,9 @@ int main(int argc, const char **argv, const char *envp[]) {
 
     // start up network
     messenger = Messenger::create_client_messenger(g_ceph_context, "client");
-    messenger->set_default_policy(Messenger::Policy::lossy_client(0, 0));
+    messenger->set_default_policy(Messenger::Policy::lossy_client(0));
     messenger->set_policy(entity_name_t::TYPE_MDS,
-                         Messenger::Policy::lossless_client(0, 0));
+                         Messenger::Policy::lossless_client(0));
 
     client = new Client(messenger, mc);
     if (filer_flags) {

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 7bde9ee10e8e268c0ff973ea5c9e0fd0f0e41227..95fa6d8a1513d2eb3c091137fb8d9a31a7eb4922 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -156,16 +156,14 @@ int main(int argc, const char **argv)
   uint64_t required =
     CEPH_FEATURE_OSDREPLYMUX;
 
-  msgr->set_default_policy(Messenger::Policy::lossy_client(0, required));
+  msgr->set_default_policy(Messenger::Policy::lossy_client(required));
   msgr->set_policy(entity_name_t::TYPE_MON,
-                   Messenger::Policy::lossy_client(0,
-                                                   CEPH_FEATURE_UID |
+                   Messenger::Policy::lossy_client(CEPH_FEATURE_UID |
                                                    CEPH_FEATURE_PGID64));
   msgr->set_policy(entity_name_t::TYPE_MDS,
-                   Messenger::Policy::lossless_peer(0,
-                                                    CEPH_FEATURE_UID));
+                   Messenger::Policy::lossless_peer(CEPH_FEATURE_UID));
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
-                   Messenger::Policy::stateful_server(0, 0));
+                   Messenger::Policy::stateful_server(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 818171478b234a50c5acacb5887dea7b65c5a700..9c9460cc2b82b7218a05a759554aa175dbbf62d6 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -660,22 +660,20 @@ int main(int argc, const char **argv)
   msgr->set_cluster_protocol(CEPH_MON_PROTOCOL);
   msgr->set_default_send_priority(CEPH_MSG_PRIO_HIGH);
 
-  msgr->set_default_policy(Messenger::Policy::stateless_server(0, 0));
+  msgr->set_default_policy(Messenger::Policy::stateless_server(0));
   msgr->set_policy(entity_name_t::TYPE_MON,
                    Messenger::Policy::lossless_peer_reuse(
-                    0,
                     CEPH_FEATURE_UID |
                     CEPH_FEATURE_PGID64 |
                     CEPH_FEATURE_MON_SINGLE_PAXOS));
   msgr->set_policy(entity_name_t::TYPE_OSD,
                    Messenger::Policy::stateless_server(
-                    0,
                     CEPH_FEATURE_PGID64 |
                     CEPH_FEATURE_OSDENC));
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
-                   Messenger::Policy::stateless_server(0, 0));
+                   Messenger::Policy::stateless_server(0));
   msgr->set_policy(entity_name_t::TYPE_MDS,
-                   Messenger::Policy::stateless_server(0, 0));
+                   Messenger::Policy::stateless_server(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 7f49d00883e56c220750298a275fc6abdc8fb077..d405de23e21dd7fba03b74883677a9f16ea2d7ba 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -497,42 +497,40 @@ flushjournal_out:
     CEPH_FEATURE_PGID64 |
     CEPH_FEATURE_OSDENC;
 
-  ms_public->set_default_policy(Messenger::Policy::stateless_server(0, 0));
+  ms_public->set_default_policy(Messenger::Policy::stateless_server(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(0,
-                                                              CEPH_FEATURE_UID |
+                               Messenger::Policy::lossy_client(CEPH_FEATURE_UID |
                                                               CEPH_FEATURE_PGID64 |
                                                               CEPH_FEATURE_OSDENC));
   ms_public->set_policy(entity_name_t::TYPE_MGR,
-                               Messenger::Policy::lossy_client(0,
-                                                              CEPH_FEATURE_UID |
+                               Messenger::Policy::lossy_client(CEPH_FEATURE_UID |
                                                               CEPH_FEATURE_PGID64 |
                                                               CEPH_FEATURE_OSDENC));
 
   //try to poison pill any OSD connections on the wrong address
   ms_public->set_policy(entity_name_t::TYPE_OSD,
-                       Messenger::Policy::stateless_server(0,0));
+                       Messenger::Policy::stateless_server(0));
 
-  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_default_policy(Messenger::Policy::stateless_server(0));
+  ms_cluster->set_policy(entity_name_t::TYPE_MON, Messenger::Policy::lossy_client(0));
   ms_cluster->set_policy(entity_name_t::TYPE_OSD,
-                        Messenger::Policy::lossless_peer(0, osd_required));
+                        Messenger::Policy::lossless_peer(osd_required));
   ms_cluster->set_policy(entity_name_t::TYPE_CLIENT,
-                        Messenger::Policy::stateless_server(0, 0));
+                        Messenger::Policy::stateless_server(0));
 
   ms_hb_front_client->set_policy(entity_name_t::TYPE_OSD,
-                         Messenger::Policy::lossy_client(0, 0));
+                         Messenger::Policy::lossy_client(0));
   ms_hb_back_client->set_policy(entity_name_t::TYPE_OSD,
-                         Messenger::Policy::lossy_client(0, 0));
+                         Messenger::Policy::lossy_client(0));
   ms_hb_back_server->set_policy(entity_name_t::TYPE_OSD,
-                               Messenger::Policy::stateless_server(0, 0));
+                               Messenger::Policy::stateless_server(0));
   ms_hb_front_server->set_policy(entity_name_t::TYPE_OSD,
-                                Messenger::Policy::stateless_server(0, 0));
+                                Messenger::Policy::stateless_server(0));
 
-  ms_objecter->set_default_policy(Messenger::Policy::lossy_client(0, CEPH_FEATURE_OSDREPLYMUX));
+  ms_objecter->set_default_policy(Messenger::Policy::lossy_client(CEPH_FEATURE_OSDREPLYMUX));
 
   r = ms_public->bind(g_conf->public_addr);
   if (r < 0)

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 789de968c0cb63529893a53e4ddc272b9a0116cd..8950a900cf242cc82761720bf1d20d86492f1d32 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -260,7 +260,7 @@ int librados::RadosClient::connect()
   // require OSDREPLYMUX feature.  this means we will fail to talk to
   // old servers.  this is necessary because otherwise we won't know
   // how to decompose the reply data into its constituent pieces.
-  messenger->set_default_policy(Messenger::Policy::lossy_client(0, CEPH_FEATURE_OSDREPLYMUX));
+  messenger->set_default_policy(Messenger::Policy::lossy_client(CEPH_FEATURE_OSDREPLYMUX));
 
   ldout(cct, 1) << "starting msgr at " << messenger->get_myaddr() << dendl;
 

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 6331fcf0e42eadbc9efbeac5778daead8254d2f6..c4df379939afa078f74888561b846ec90c977633 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -102,31 +102,31 @@ public:
        features_supported(CEPH_FEATURES_SUPPORTED_DEFAULT),
        features_required(0) {}
   private:
-    Policy(bool l, bool s, bool st, bool r, uint64_t sup, uint64_t req)
+    Policy(bool l, bool s, bool st, bool r, uint64_t req)
       : lossy(l), server(s), standby(st), resetcheck(r),
        throttler_bytes(NULL),
        throttler_messages(NULL),
-       features_supported(sup | CEPH_FEATURES_SUPPORTED_DEFAULT),
+       features_supported(CEPH_FEATURES_SUPPORTED_DEFAULT),
        features_required(req) {}
 
   public:
-    static Policy stateful_server(uint64_t sup, uint64_t req) {
-      return Policy(false, true, true, true, sup, req);
+    static Policy stateful_server(uint64_t req) {
+      return Policy(false, true, true, true, req);
     }
-    static Policy stateless_server(uint64_t sup, uint64_t req) {
-      return Policy(true, true, false, false, sup, req);
+    static Policy stateless_server(uint64_t req) {
+      return Policy(true, true, false, false, req);
     }
-    static Policy lossless_peer(uint64_t sup, uint64_t req) {
-      return Policy(false, false, true, false, sup, req);
+    static Policy lossless_peer(uint64_t req) {
+      return Policy(false, false, true, false, req);
     }
-    static Policy lossless_peer_reuse(uint64_t sup, uint64_t req) {
-      return Policy(false, false, true, true, sup, req);
+    static Policy lossless_peer_reuse(uint64_t req) {
+      return Policy(false, false, true, true, req);
     }
-    static Policy lossy_client(uint64_t sup, uint64_t req) {
-      return Policy(true, false, false, false, sup, req);
+    static Policy lossy_client(uint64_t req) {
+      return Policy(true, false, false, false, req);
     }
-    static Policy lossless_client(uint64_t sup, uint64_t req) {
-      return Policy(false, false, false, true, sup, req);
+    static Policy lossless_client(uint64_t req) {
+      return Policy(false, false, false, true, req);
     }
   };
 

diff --git a/src/test/messenger/simple_client.cc b/src/test/messenger/simple_client.cc
index 6fb01e9a9eba853b8b5cae42735cccc55bda0704..7b37921b04fb0aaa1ac4e909accf316cb1de2927 100644 (file)
--- a/src/test/messenger/simple_client.cc
+++ b/src/test/messenger/simple_client.cc
@@ -110,7 +110,7 @@ int main(int argc, const char **argv)
 
        // enable timing prints
        messenger->set_magic(MSG_MAGIC_TRACE_CTR);
-       messenger->set_default_policy(Messenger::Policy::lossy_client(0, 0));
+       messenger->set_default_policy(Messenger::Policy::lossy_client(0));
 
        string dest_str = "tcp://";
        dest_str += addr;

diff --git a/src/test/messenger/simple_server.cc b/src/test/messenger/simple_server.cc
index df94701e53587f4392c734b73dc249b7e71fc419..a10cdc5472cdf6304df105ff5c19371dfb44808e 100644 (file)
--- a/src/test/messenger/simple_server.cc
+++ b/src/test/messenger/simple_server.cc
@@ -82,7 +82,7 @@ int main(int argc, const char **argv)
        // enable timing prints
        messenger->set_magic(MSG_MAGIC_TRACE_CTR);
        messenger->set_default_policy(
-         Messenger::Policy::stateless_server(CEPH_FEATURES_ALL, 0));
+         Messenger::Policy::stateless_server(0));
 
        r = messenger->bind(bind_addr);
        if (r < 0)

diff --git a/src/test/messenger/xio_client.cc b/src/test/messenger/xio_client.cc
index da132060dc8b181fdebe3e15e5340c1fdef3070c..35218cbb25890ca42ed518f0412e3b93122c2144 100644 (file)
--- a/src/test/messenger/xio_client.cc
+++ b/src/test/messenger/xio_client.cc
@@ -131,7 +131,7 @@ int main(int argc, const char **argv)
        if (n_dsize)
          (void) static_cast<XioMessenger*>(messenger)->pool_hint(n_dsize);
 
-       messenger->set_default_policy(Messenger::Policy::lossy_client(0, 0));
+       messenger->set_default_policy(Messenger::Policy::lossy_client(0));
 
        string dest_str = "tcp://";
        dest_str += addr;

diff --git a/src/test/messenger/xio_server.cc b/src/test/messenger/xio_server.cc
index a5459a55e200021d3620cfbb8853f6ac0ac14262..d50737b924b7c6e64048fb119694c96f23a0c5c1 100644 (file)
--- a/src/test/messenger/xio_server.cc
+++ b/src/test/messenger/xio_server.cc
@@ -97,7 +97,7 @@ int main(int argc, const char **argv)
          MSG_MAGIC_TRACE_CTR /* timing prints */);
 
        messenger->set_default_policy(
-         Messenger::Policy::stateless_server(CEPH_FEATURES_ALL, 0));
+         Messenger::Policy::stateless_server(0));
 
        r = messenger->bind(bind_addr);
        if (r < 0)

diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc
index b4b7c0e8dc97e35d9fb574e26f7894dceb14f061..922abea87cee01e79de81b49b22a43e5353a944e 100644 (file)
--- a/src/test/mon/test-mon-msg.cc
+++ b/src/test/mon/test-mon-msg.cc
@@ -83,7 +83,7 @@ public:
     msg = Messenger::create(cct, public_msgr_type, entity_name_t::CLIENT(-1),
                             "test-mon-msg", 0, 0);
     assert(msg != NULL);
-    msg->set_default_policy(Messenger::Policy::lossy_client(0,0));
+    msg->set_default_policy(Messenger::Policy::lossy_client(0));
     dout(0) << __func__ << " starting messenger at "
             << msg->get_myaddr() << dendl;
     msg->start();

diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index baffc5faf7190a1dfd6171400614aaf36f43c606..c9cba51965972e1177e55ad97485e4763a6880ba 100644 (file)
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -253,7 +253,7 @@ class ClientStub : public TestStub
     assert(messenger.get() != NULL);
 
     messenger->set_default_policy(
-       Messenger::Policy::lossy_client(0, CEPH_FEATURE_OSDREPLYMUX));
+       Messenger::Policy::lossy_client(CEPH_FEATURE_OSDREPLYMUX));
     dout(10) << "ClientStub::" << __func__ << " starting messenger at "
            << messenger->get_myaddr() << dendl;
 
@@ -369,15 +369,16 @@ class OSDStub : public TestStub
        g_conf->osd_client_message_size_cap);
 
     messenger->set_default_policy(
-       Messenger::Policy::stateless_server(0, 0));
+       Messenger::Policy::stateless_server(0));
     messenger->set_policy_throttlers(entity_name_t::TYPE_CLIENT,
                                    &throttler, NULL);
     messenger->set_policy(entity_name_t::TYPE_MON,
-       Messenger::Policy::lossy_client(0, CEPH_FEATURE_UID |
+       Messenger::Policy::lossy_client(
+         CEPH_FEATURE_UID |
          CEPH_FEATURE_PGID64 |
          CEPH_FEATURE_OSDENC));
     messenger->set_policy(entity_name_t::TYPE_OSD,
-       Messenger::Policy::stateless_server(0,0));
+       Messenger::Policy::stateless_server(0));
 
     dout(10) << __func__ << " public addr " << g_conf->public_addr << dendl;
     int err = messenger->bind(g_conf->public_addr);

diff --git a/src/test/msgr/perf_msgr_client.cc b/src/test/msgr/perf_msgr_client.cc
index 8da71c5ad04e6967d3ddf7d63cf6ba9699b33277..9648850766170b1687e4cd827c47004f2ca625f5 100644 (file)
--- a/src/test/msgr/perf_msgr_client.cc
+++ b/src/test/msgr/perf_msgr_client.cc
@@ -134,7 +134,7 @@ class MessengerClient {
     addr.set_nonce(0);
     for (int i = 0; i < jobs; ++i) {
       Messenger *msgr = Messenger::create(g_ceph_context, type, entity_name_t::CLIENT(0), "client", getpid()+i, 0);
-      msgr->set_default_policy(Messenger::Policy::lossless_client(0, 0));
+      msgr->set_default_policy(Messenger::Policy::lossless_client(0));
       entity_inst_t inst(entity_name_t::OSD(0), addr);
       ConnectionRef conn = msgr->get_connection(inst);
       ClientThread *t = new ClientThread(msgr, c, conn, msg_len, ops, think_time_us);

diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc
index 2d428386ecb90a55dac761ed4dfc8c95ebeae526..46f28e394161088fa3bb790adf03fcd34ad67279 100644 (file)
--- a/src/test/msgr/perf_msgr_server.cc
+++ b/src/test/msgr/perf_msgr_server.cc
@@ -117,7 +117,7 @@ class MessengerServer {
   MessengerServer(string t, string addr, int threads, int delay):
       msgr(NULL), type(t), bindaddr(addr), dispatcher(threads, delay) {
     msgr = Messenger::create(g_ceph_context, type, entity_name_t::OSD(0), "server", 0, 0);
-    msgr->set_default_policy(Messenger::Policy::stateless_server(0, 0));
+    msgr->set_default_policy(Messenger::Policy::stateless_server(0));
   }
   ~MessengerServer() {
     msgr->shutdown();

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index fdda005e267a16442378173df02d1f21e67488ba..572b8d578b200762a2c977b15409262031dbd0c3 100644 (file)
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -67,8 +67,8 @@ class MessengerTest : public ::testing::TestWithParam<const char*> {
     lderr(g_ceph_context) << __func__ << " start set up " << GetParam() << dendl;
     server_msgr = Messenger::create(g_ceph_context, string(GetParam()), entity_name_t::OSD(0), "server", getpid(), 0);
     client_msgr = Messenger::create(g_ceph_context, string(GetParam()), entity_name_t::CLIENT(-1), "client", getpid(), 0);
-    server_msgr->set_default_policy(Messenger::Policy::stateless_server(0, 0));
-    client_msgr->set_default_policy(Messenger::Policy::lossy_client(0, 0));
+    server_msgr->set_default_policy(Messenger::Policy::stateless_server(0));
+    client_msgr->set_default_policy(Messenger::Policy::lossy_client(0));
   }
   void TearDown() override {
     ASSERT_EQ(server_msgr->get_dispatch_queue_len(), 0);
@@ -423,9 +423,9 @@ TEST_P(MessengerTest, StatefulTest) {
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
   entity_addr_t bind_addr;
   bind_addr.parse("127.0.0.1");
-  Messenger::Policy p = Messenger::Policy::stateful_server(0, 0);
+  Messenger::Policy p = Messenger::Policy::stateful_server(0);
   server_msgr->set_policy(entity_name_t::TYPE_CLIENT, p);
-  p = Messenger::Policy::lossless_client(0, 0);
+  p = Messenger::Policy::lossless_client(0);
   client_msgr->set_policy(entity_name_t::TYPE_OSD, p);
 
   server_msgr->bind(bind_addr);
@@ -518,9 +518,9 @@ TEST_P(MessengerTest, StatelessTest) {
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
   entity_addr_t bind_addr;
   bind_addr.parse("127.0.0.1");
-  Messenger::Policy p = Messenger::Policy::stateless_server(0, 0);
+  Messenger::Policy p = Messenger::Policy::stateless_server(0);
   server_msgr->set_policy(entity_name_t::TYPE_CLIENT, p);
-  p = Messenger::Policy::lossy_client(0, 0);
+  p = Messenger::Policy::lossy_client(0);
   client_msgr->set_policy(entity_name_t::TYPE_OSD, p);
 
   server_msgr->bind(bind_addr);
@@ -591,9 +591,9 @@ TEST_P(MessengerTest, ClientStandbyTest) {
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
   entity_addr_t bind_addr;
   bind_addr.parse("127.0.0.1");
-  Messenger::Policy p = Messenger::Policy::stateful_server(0, 0);
+  Messenger::Policy p = Messenger::Policy::stateful_server(0);
   server_msgr->set_policy(entity_name_t::TYPE_CLIENT, p);
-  p = Messenger::Policy::lossless_peer(0, 0);
+  p = Messenger::Policy::lossless_peer(0);
   client_msgr->set_policy(entity_name_t::TYPE_OSD, p);
 
   server_msgr->bind(bind_addr);
@@ -708,9 +708,9 @@ TEST_P(MessengerTest, MessageTest) {
   FakeDispatcher cli_dispatcher(false), srv_dispatcher(true);
   entity_addr_t bind_addr;
   bind_addr.parse("127.0.0.1");
-  Messenger::Policy p = Messenger::Policy::stateful_server(0, 0);
+  Messenger::Policy p = Messenger::Policy::stateful_server(0);
   server_msgr->set_policy(entity_name_t::TYPE_CLIENT, p);
-  p = Messenger::Policy::lossless_peer(0, 0);
+  p = Messenger::Policy::lossless_peer(0);
   client_msgr->set_policy(entity_name_t::TYPE_OSD, p);
 
   server_msgr->bind(bind_addr);
@@ -1164,8 +1164,8 @@ bool SyntheticDispatcher::ms_handle_reset(Connection *con) {
 
 TEST_P(MessengerTest, SyntheticStressTest) {
   SyntheticWorkload test_msg(8, 32, GetParam(), 100,
-                             Messenger::Policy::stateful_server(0, 0),
-                             Messenger::Policy::lossless_client(0, 0));
+                             Messenger::Policy::stateful_server(0),
+                             Messenger::Policy::lossless_client(0));
   for (int i = 0; i < 100; ++i) {
     if (!(i % 10)) lderr(g_ceph_context) << "seeding connection " << i << dendl;
     test_msg.generate_connection();
@@ -1193,8 +1193,8 @@ TEST_P(MessengerTest, SyntheticStressTest) {
 
 TEST_P(MessengerTest, SyntheticStressTest1) {
   SyntheticWorkload test_msg(16, 32, GetParam(), 100,
-                             Messenger::Policy::lossless_peer_reuse(0, 0),
-                             Messenger::Policy::lossless_peer_reuse(0, 0));
+                             Messenger::Policy::lossless_peer_reuse(0),
+                             Messenger::Policy::lossless_peer_reuse(0));
   for (int i = 0; i < 10; ++i) {
     if (!(i % 10)) lderr(g_ceph_context) << "seeding connection " << i << dendl;
     test_msg.generate_connection();
@@ -1227,8 +1227,8 @@ TEST_P(MessengerTest, SyntheticInjectTest) {
   g_ceph_context->_conf->set_val("ms_inject_internal_delays", "0.1");
   g_ceph_context->_conf->set_val("ms_dispatch_throttle_bytes", "16777216");
   SyntheticWorkload test_msg(8, 32, GetParam(), 100,
-                             Messenger::Policy::stateful_server(0, 0),
-                             Messenger::Policy::lossless_client(0, 0));
+                             Messenger::Policy::stateful_server(0),
+                             Messenger::Policy::lossless_client(0));
   for (int i = 0; i < 100; ++i) {
     if (!(i % 10)) lderr(g_ceph_context) << "seeding connection " << i << dendl;
     test_msg.generate_connection();
@@ -1262,8 +1262,8 @@ TEST_P(MessengerTest, SyntheticInjectTest2) {
   g_ceph_context->_conf->set_val("ms_inject_socket_failures", "30");
   g_ceph_context->_conf->set_val("ms_inject_internal_delays", "0.1");
   SyntheticWorkload test_msg(8, 16, GetParam(), 100,
-                             Messenger::Policy::lossless_peer_reuse(0, 0),
-                             Messenger::Policy::lossless_peer_reuse(0, 0));
+                             Messenger::Policy::lossless_peer_reuse(0),
+                             Messenger::Policy::lossless_peer_reuse(0));
   for (int i = 0; i < 100; ++i) {
     if (!(i % 10)) lderr(g_ceph_context) << "seeding connection " << i << dendl;
     test_msg.generate_connection();
@@ -1295,8 +1295,8 @@ TEST_P(MessengerTest, SyntheticInjectTest3) {
   g_ceph_context->_conf->set_val("ms_inject_socket_failures", "600");
   g_ceph_context->_conf->set_val("ms_inject_internal_delays", "0.1");
   SyntheticWorkload test_msg(8, 16, GetParam(), 100,
-                             Messenger::Policy::stateless_server(0, 0),
-                             Messenger::Policy::lossy_client(0, 0));
+                             Messenger::Policy::stateless_server(0),
+                             Messenger::Policy::lossy_client(0));
   for (int i = 0; i < 100; ++i) {
     if (!(i % 10)) lderr(g_ceph_context) << "seeding connection " << i << dendl;
     test_msg.generate_connection();
@@ -1332,8 +1332,8 @@ TEST_P(MessengerTest, SyntheticInjectTest4) {
   g_ceph_context->_conf->set_val("ms_inject_delay_type", "client osd", false, false);
   g_ceph_context->_conf->set_val("ms_inject_delay_max", "5");
   SyntheticWorkload test_msg(16, 32, GetParam(), 100,
-                             Messenger::Policy::lossless_peer(0, 0),
-                             Messenger::Policy::lossless_peer(0, 0));
+                             Messenger::Policy::lossless_peer(0),
+                             Messenger::Policy::lossless_peer(0));
   for (int i = 0; i < 100; ++i) {
     if (!(i % 10)) lderr(g_ceph_context) << "seeding connection " << i << dendl;
     test_msg.generate_connection();

diff --git a/src/test/osd/TestOSDScrub.cc b/src/test/osd/TestOSDScrub.cc
index 9c0a2f2503b65d70dcef29dee18193dea2e7bdcf..c39ce96cc09a7a0af80bd0029c99fe3224a27a8a 100644 (file)
--- a/src/test/osd/TestOSDScrub.cc
+++ b/src/test/osd/TestOSDScrub.cc
@@ -61,7 +61,7 @@ TEST(TestOSDScrub, scrub_time_permit) {
                                    entity_name_t::OSD(0), "make_checker",
                                    getpid(), 0);
   ms->set_cluster_protocol(CEPH_OSD_PROTOCOL);
-  ms->set_default_policy(Messenger::Policy::stateless_server(0, 0));
+  ms->set_default_policy(Messenger::Policy::stateless_server(0));
   ms->bind(g_conf->public_addr);
   MonClient mc(g_ceph_context);
   mc.build_initial_monmap();