src/mon: Added more loggings for disallowed_leaders

Added more loggings regarding the disallowed_leaders
set so that it is easier to debug problems like:

https://tracker.ceph.com/issues/63183

Fixes: https://tracker.ceph.com/issues/63183
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 17bd0c6aca24a8d10b1f346462d6df2e29afd80e)

diff --git a/src/mon/ElectionLogic.cc b/src/mon/ElectionLogic.cc
index e22a85bed56f8bddb17351d3f64356c1255f7b66..0c1b30c417c5eb462e37d9975d9d061727aec604 100644 (file)
--- a/src/mon/ElectionLogic.cc
+++ b/src/mon/ElectionLogic.cc
@@ -398,7 +398,8 @@ void ElectionLogic::propose_connectivity_handler(int from, epoch_t mepoch,
   ldout(cct, 10) << "propose from rank=" << from << ",from_score=" << from_score
                 << "; my score=" << my_score
                 << "; currently acked " << leader_acked
-                << ",leader_score=" << leader_score << dendl;
+                << ",leader_score=" << leader_score
+     << ",disallowed_leaders=" << elector->get_disallowed_leaders() << dendl;
 
   bool my_win = (my_score >= 0) && // My score is non-zero; I am allowed to lead
     ((my_rank < from && my_score >= from_score) || // We have same scores and I have lower rank, or

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 33b9aa8fa2880e5f4fd79a3e1c5e6368d723cf33..bb8a4b19455d6c28713006cea7a78f68afb5af28 100644 (file)
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -369,6 +369,7 @@ void MonMap::print_summary(ostream& out) const
     has_printed = true;
   }
   out << "}" << " removed_ranks: {" << removed_ranks << "}";
+  out << " disallowed_leaders: {" << disallowed_leaders << "}";
 }
  
 void MonMap::print(ostream& out) const

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 6cde875171450fa3b39d47615df7ca00cbcb293e..08a36a2e8fd4347d24ccecc776584f26afcb0665 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2004,6 +2004,7 @@ void Monitor::handle_probe_reply(MonOpRequestRef op)
       dout(10) << " got newer/committed monmap epoch " << newmap->get_epoch()
               << ", mine was " << monmap->get_epoch() << dendl;
       int epoch_diff = newmap->get_epoch() - monmap->get_epoch();
+      dout(20) << " new monmap is " << *newmap  << dendl;
       delete newmap;
       monmap->decode(m->monmap_bl);
       dout(20) << "has_ever_joined: " << has_ever_joined << dendl;