From: Sage Weil <sage@newdream.net>
Date: Fri, 28 Aug 2009 19:54:10 +0000 (-0700)
Subject: msgr: set default policy correctly
X-Git-Tag: v0.14~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b431b8daed770fdf223cde0ede097a2d1df5a33;p=ceph.git

msgr: set default policy correctly
---

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index f284c403ee37..c669924247c7 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -371,7 +371,7 @@ void SimpleMessenger::Endpoint::prepare_dest(const entity_inst_t& inst)
   rank->lock.Lock();
   {
     if (rank->rank_pipe.count(inst.addr) == 0)
-      rank->connect_rank(inst.addr, rank->policy_map[inst.name.type()]);
+      rank->connect_rank(inst.addr, rank->get_policy(inst.name.type()));
   }
   rank->lock.Unlock();
 }
@@ -556,10 +556,7 @@ int SimpleMessenger::Pipe::accept()
     rank->lock.Lock();
 
     // note peer's type, flags
-    if (rank->policy_map.count(connect.host_type))
-      policy = rank->policy_map[connect.host_type];  /* apply policy */
-    else
-      policy = rank->default_policy;
+    policy = rank->get_policy(connect.host_type);
     dout(10) << "accept host_type " << connect.host_type
 	     << ", setting policy, lossy_tx=" << policy.lossy_tx << dendl;
     lossy_rx = connect.flags & CEPH_MSG_CONNECT_LOSSY;
@@ -1379,18 +1376,16 @@ void SimpleMessenger::Pipe::writer()
   lock.Lock();
 
   while (state != STATE_CLOSED) {// && state != STATE_WAIT) {
+    dout(10) << "writer: state = " << state << " policy.server=" << policy.server << dendl;
+
     // standby?
-    if (!q.empty() && state == STATE_STANDBY)
+    if (!q.empty() && state == STATE_STANDBY && !policy.server)
       state = STATE_CONNECTING;
 
     // connect?
     if (state == STATE_CONNECTING) {
-      if (policy.server) {
-	state = STATE_STANDBY;
-      } else {
-	connect();
-	continue;
-      }
+      connect();
+      continue;
     }
     
     if (state == STATE_CLOSING) {
@@ -2072,7 +2067,7 @@ void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool
 	} else {
 	  dout(20) << "submit_message " << *m << " remote, " << dest_addr << ", new pipe." << dendl;
 	  // not connected.
-	  pipe = connect_rank(dest_proc_addr, policy_map[dest.name.type()]);
+	  pipe = connect_rank(dest_proc_addr, get_policy(dest.name.type()));
 	  pipe->send(m);
 	}
       }
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 0c0567d521a1..3d8c6e98eb34 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -416,6 +416,13 @@ private:
 
   void reaper();
 
+  Policy get_policy(int t) {
+    if (policy_map.count(t))
+      return policy_map[t];
+    else
+      return default_policy;
+  }
+
 public:
   SimpleMessenger() : accepter(this),
 	   lock("SimpleMessenger::lock"), started(false), need_addr(true),