osd: use fast_fail() policy to connect to osd

diff --git a/src/cfuse.cc b/src/cfuse.cc
index f7420df4c996489e86386bc70c4b4320c67918a0..0d35899043727338a54ed1ca7b19421f78399da2 100644 (file)
--- 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 f298129f3f43b9e765f270a457d418991068db99..b1c0524c0970ab26bdd93b6d622230289f0d32c1 100644 (file)
--- 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 a3831afa2d31b7414a8f58b5802cedca7bbf41c0..e572068ceef75961179cf075b7f04cdecc700cdf 100644 (file)
--- 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 f42281b9d935eab25ee2ec7db6685e30d66e8f32..715c3ec9e6edcadbdf450abc6ebc2ff93906bc29 100644 (file)
--- 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 d29c039523da19171987945d74ba58b3dbefcb54..f9469f41b27facab64335a879de82912a44e6594 100644 (file)
--- 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);