From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Jan 2019 20:04:37 +0000 (-0600)
Subject: mon/MonClient: make mon hunt more aggressive
X-Git-Tag: v14.1.0~437^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25841%2Fhead;p=ceph.git

mon/MonClient: make mon hunt more aggressive

With v2 and v1 addresses, it helps to be a bit more aggressive
searching for mons since the v1 or v2 ports may not be in use.

- try 3 parallel connection attempts, not 2
- increase the timeout interval more slowly

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index b85bc2e776c9b..4ab41d9b91046 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2057,7 +2057,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_client_hunt_parallel", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(2)
+    .set_default(3)
     .set_description(""),
 
     Option("mon_client_hunt_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -2073,7 +2073,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_client_hunt_interval_backoff", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(2.0)
+    .set_default(1.5)
     .set_description(""),
 
     Option("mon_client_hunt_interval_min_multiple", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)