From: Sage Weil <sage@redhat.com>
Date: Thu, 24 Oct 2019 13:00:32 +0000 (-0500)
Subject: mon/MonClient: fix mon tell to older mons
X-Git-Tag: v15.1.0~1170^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31121%2Fhead;p=ceph.git

mon/MonClient: fix mon tell to older mons

For older mons, we need to call into send_command so that we trigger the
compat code that futzes with our mon sessions.

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 67b47d6cd73..dbb4287a2a2 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -1196,7 +1196,10 @@ void MonClient::_resend_mon_commands()
   while (p != mon_commands.end()) {
     auto cmd = p->second;
     ++p;
-    if (!cmd->is_tell()) {
+    if (cmd->is_tell() && monmap.min_mon_release >= ceph_release_t::octopus) {
+      // starting with octopus, tell commands use their own connetion and need no
+      // special resend when we finish hunting.
+    } else {
       _send_command(cmd); // might remove cmd from mon_commands
     }
   }