From b560f03dcd01fd73c6870a3bbf9ff20bf01ec2fd Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 17 Jul 2019 16:46:52 -0500
Subject: [PATCH] mon/MonClient: allow retries to be adjusted

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 2c8e538e8352d17f8f64c77b80e18a764540c8d0)
---
 src/common/legacy_config_opts.h | 1 +
 src/common/options.cc           | 4 ++++
 src/mon/MonClient.cc            | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 72a0f389632a..2d57f05fe415 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -343,6 +343,7 @@ OPTION(mon_client_ping_timeout, OPT_DOUBLE)   // fail if we don't hear back
 OPTION(mon_client_hunt_interval_backoff, OPT_DOUBLE) // each time we reconnect to a monitor, double our timeout
 OPTION(mon_client_hunt_interval_max_multiple, OPT_DOUBLE) // up to a max of 10*default (30 seconds)
 OPTION(mon_client_max_log_entries_per_message, OPT_INT)
+OPTION(mon_client_directed_command_retry, OPT_INT)
 OPTION(client_cache_size, OPT_INT)
 OPTION(client_cache_mid, OPT_FLOAT)
 OPTION(client_use_random_mds, OPT_BOOL)
diff --git a/src/common/options.cc b/src/common/options.cc
index 22691b9ddac8..adb10c7f0930 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2235,6 +2235,10 @@ std::vector<Option> get_global_options() {
     .set_default(1000)
     .set_description(""),
 
+    Option("mon_client_directed_command_retry", Option::TYPE_INT, Option::LEVEL_DEV)
+    .set_default(2)
+    .set_description("Number of times to try sending a comamnd directed at a specific monitor"),
+
     Option("mon_max_pool_pg_num", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(65536)
     .set_description(""),
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index c08d95dcdfae..855ce4ec9592 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -1010,7 +1010,7 @@ void MonClient::_send_command(MonCommand *r)
 
   if (r->target_rank >= 0 &&
       r->target_rank != monmap.get_rank(peer)) {
-    if (r->send_attempts > 1) {
+    if (r->send_attempts > cct->_conf->mon_client_directed_command_retry) {
       _finish_command(r, -ENXIO, "mon unavailable");
       return;
     }
@@ -1029,7 +1029,7 @@ void MonClient::_send_command(MonCommand *r)
 
   if (r->target_name.length() &&
       r->target_name != monmap.get_name(peer)) {
-    if (r->send_attempts > 1) {
+    if (r->send_attempts > cct->_conf->mon_client_directed_command_retry) {
       _finish_command(r, -ENXIO, "mon unavailable");
       return;
     }
-- 
2.47.3