From: Sage Weil <sage@newdream.net>
Date: Thu, 8 Oct 2009 17:34:09 +0000 (-0700)
Subject: osd: use fast_fail() policy to connect to osd
X-Git-Tag: v0.17~115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=416cd968b93effdcd6c65c47ae2abb84a9a3f0a9;p=ceph.git

osd: use fast_fail() policy to connect to osd
---

diff --git a/src/cfuse.cc b/src/cfuse.cc
index f7420df4c996..0d3589904372 100644
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -77,7 +77,7 @@ int main(int argc, const char **argv, const char *envp[]) {
 
   rank.set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::lossy_fail_after(1.0));
   rank.set_policy(entity_name_t::TYPE_MDS, SimpleMessenger::Policy::lossless());
-  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossless());
+  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossy_fast_fail());
 
   // start client
   client->init();
diff --git a/src/client/libceph.cc b/src/client/libceph.cc
index f298129f3f43..b1c0524c0970 100644
--- a/src/client/libceph.cc
+++ b/src/client/libceph.cc
@@ -57,7 +57,7 @@ extern "C" int ceph_initialize(int argc, const char **argv)
     rank->start();
     rank->set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::lossy_fast_fail());
     rank->set_policy(entity_name_t::TYPE_MDS, SimpleMessenger::Policy::lossless());
-    rank->set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossless());
+    rank->set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossy_fast_fail());
 
     client->init();
   }
diff --git a/src/cmds.cc b/src/cmds.cc
index a3831afa2d31..e572068ceef7 100644
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -81,7 +81,7 @@ int main(int argc, const char **argv)
   rank.set_default_policy(SimpleMessenger::Policy::stateful_server());
   rank.set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::lossy_fail_after(1.0));
   rank.set_policy(entity_name_t::TYPE_MDS, SimpleMessenger::Policy::lossless());
-  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossless());
+  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossy_fast_fail());
 
   rank.start();
   
diff --git a/src/csyn.cc b/src/csyn.cc
index f42281b9d935..715c3ec9e6ed 100644
--- a/src/csyn.cc
+++ b/src/csyn.cc
@@ -60,7 +60,7 @@ int main(int argc, const char **argv, char *envp[])
 
   rank.set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::lossy_fail_after(2.0));
   rank.set_policy(entity_name_t::TYPE_MDS, SimpleMessenger::Policy::lossless());
-  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossless());
+  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossy_fast_fail());
 
   list<Client*> clients;
   list<SyntheticClient*> synclients;
diff --git a/src/librados.cc b/src/librados.cc
index d29c039523da..f9469f41b27f 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -294,7 +294,7 @@ bool RadosClient::init()
 
   rank.set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::lossy_fail_after(1.0));
   rank.set_policy(entity_name_t::TYPE_MDS, SimpleMessenger::Policy::lossless());
-  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossless());
+  rank.set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossy_fast_fail());
   rank.set_policy(entity_name_t::TYPE_CLIENT, SimpleMessenger::Policy::lossless());  // mds does its own timeout/markdown
 
   rank.start(1);