From: Sage Weil <sage@newdream.net>
Date: Wed, 26 Aug 2009 17:42:45 +0000 (-0700)
Subject: msgr: fix policy setting
X-Git-Tag: v0.14~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d99fbb009e914583244ab6a14bc4b193045e337b;p=ceph.git

msgr: fix policy setting
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 5162d5e897c6..03fd483f1a1a 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -111,6 +111,7 @@ int MonClient::get_monmap()
   if (!messenger) {
     rank = new SimpleMessenger;
     rank->bind();
+    rank->set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::lossy_fast_fail());
     messenger = rank->register_entity(entity_name_t::CLIENT(-1));
     messenger->set_dispatcher(this);
     rank->start(true);  // do not daemonize!
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 22978361d0e5..195f4389bf31 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -214,7 +214,6 @@ void *SimpleMessenger::Accepter::entry()
       rank->lock.Lock();
       if (rank->num_local > 0) {
 	Pipe *p = new Pipe(rank, Pipe::STATE_ACCEPTING);
-	p->policy = rank->default_policy;
 	p->sd = sd;
 	p->start_reader();
 	rank->pipes.insert(p);
@@ -472,6 +471,7 @@ ostream& SimpleMessenger::Pipe::_pipe_prefix() {
 		<< " sd=" << sd
 		<< " pgs=" << peer_global_seq
 		<< " cs=" << connect_seq
+		<< " ltx=" << policy.lossy_tx
 		<< ").";
 }
 
@@ -554,7 +554,12 @@ int SimpleMessenger::Pipe::accept()
     rank->lock.Lock();
 
     // note peer's type, flags
-    policy = rank->policy_map[connect.host_type];  /* apply policy */
+    if (rank->policy_map.count(connect.host_type))
+      policy = rank->policy_map[connect.host_type];  /* apply policy */
+    else
+      policy = rank->default_policy;
+    dout(10) << "accept host_type " << connect.host_type
+	     << ", setting policy, lossy_tx=" << policy.lossy_tx << dendl;
     lossy_rx = connect.flags & CEPH_MSG_CONNECT_LOSSY;
 
     memset(&reply, 0, sizeof(reply));
@@ -2046,10 +2051,12 @@ void SimpleMessenger::submit_message(Message *m, const entity_addr_t& dest_addr,
 	} else {
 	  dout(20) << "submit_message " << *m << " dest " << dest << " remote, " << dest_addr << ", have pipe." << dendl;
 
+	  /*
 	  // if this pipe was created by an incoming connection, but we haven't received
 	  // a message yet, then it won't have the policy set.
 	  if (pipe->get_out_seq() == 0)
 	    pipe->policy = policy_map[m->get_dest().type()];
+	  */
 
 	  pipe->_send(m);
 	  pipe->lock.Unlock();