From bb84373070e9b05e96634a9e77e95942b85b99ce Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 24 Oct 2019 08:00:32 -0500 Subject: [PATCH] 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 --- src/mon/MonClient.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 67b47d6cd7313..dbb4287a2a2eb 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 } } -- 2.39.5