From: Gregory Farnum <gfarnum@GF-Macbook.local>
Date: Fri, 30 Jul 2010 16:23:46 +0000 (-0700)
Subject: cosd: adjust client/cluster messenger setup to be more consistent
X-Git-Tag: v0.22~321
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c26cb7276f4ea2a6887241643085317c9de3a8fc;p=ceph.git

cosd: adjust client/cluster messenger setup to be more consistent
and poison better
---

diff --git a/src/cosd.cc b/src/cosd.cc
index 08d56c32257b..b1dfc4356e09 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -243,19 +243,15 @@ int main(int argc, const char **argv)
     CEPH_FEATURE_UID | 
     CEPH_FEATURE_NOSRCADDR;
   client_messenger->set_default_policy(SimpleMessenger::Policy::stateless_server(supported, 0));
-  client_messenger->set_policy(entity_name_t::TYPE_MON,
-			SimpleMessenger::Policy::client(supported,
-							CEPH_FEATURE_UID));
-  client_messenger->set_policy(entity_name_t::TYPE_OSD,
-			SimpleMessenger::Policy::lossless_peer(supported,
-							       CEPH_FEATURE_UID));
   client_messenger->set_policy(entity_name_t::TYPE_CLIENT,
 			SimpleMessenger::Policy::stateless_server(supported, 0));
   client_messenger->set_policy_throttler(entity_name_t::TYPE_CLIENT, &client_throttler);
-
+  client_messenger->set_policy(entity_name_t::TYPE_MON,
+                               SimpleMessenger::Policy::client(supported,
+                                                               CEPH_FEATURE_UID));
   if (cluster_messenger != client_messenger) {
     cluster_messenger->register_entity(entity_name_t::OSD(whoami));
-    cluster_messenger->set_default_policy(SimpleMessenger::Policy::stateless_server(supported, 0));
+    cluster_messenger->set_default_policy(SimpleMessenger::Policy::stateless_server(0, 0));
     cluster_messenger->set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::client(0,0));
     cluster_messenger->set_policy(entity_name_t::TYPE_OSD,
                                   SimpleMessenger::Policy::lossless_peer(supported, CEPH_FEATURE_UID));
@@ -265,6 +261,10 @@ int main(int argc, const char **argv)
     //try to poison pill any OSD connections on the wrong address
     client_messenger->set_policy(entity_name_t::TYPE_OSD,
                                  SimpleMessenger::Policy::stateless_server(0,0));
+  } else {
+    client_messenger->set_policy(entity_name_t::TYPE_OSD,
+				 SimpleMessenger::Policy::lossless_peer(supported,
+									CEPH_FEATURE_UID));
   }