From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Sep 2019 14:57:48 +0000 (-0500)
Subject: osd/PeeringState: log_weirdness during peering
X-Git-Tag: v15.1.0~1584^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=60aef55d43c5bd9d4095dbc76314be3c67d73878;p=ceph-ci.git

osd/PeeringState: log_weirdness during peering

Log this in a few more places so that we can catch issues sooner.

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

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 81262f31760..616cdd72b2f 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -4121,6 +4121,7 @@ PeeringState::Reset::Reset(my_context ctx)
 
   ps->flushes_in_progress = 0;
   ps->set_last_peering_reset();
+  ps->log_weirdness();
 }
 
 boost::statechart::result
@@ -5990,6 +5991,7 @@ PeeringState::GetInfo::GetInfo(my_context ctx)
 
   DECLARE_LOCALS;
   ps->check_past_interval_bounds();
+  ps->log_weirdness();
   PastIntervals::PriorSet &prior_set = context< Peering >().prior_set;
 
   ceph_assert(ps->blocked_by.empty());
@@ -6140,6 +6142,8 @@ PeeringState::GetLog::GetLog(my_context ctx)
 
   DECLARE_LOCALS;
 
+  ps->log_weirdness();
+
   // adjust acting?
   if (!ps->choose_acting(auth_log_shard, false,
 			 &context< Peering >().history_les_bound)) {
@@ -6459,6 +6463,7 @@ PeeringState::GetMissing::GetMissing(my_context ctx)
   context< PeeringMachine >().log_enter(state_name);
 
   DECLARE_LOCALS;
+  ps->log_weirdness();
   ceph_assert(!ps->acting_recovery_backfill.empty());
   eversion_t since;
   for (set<pg_shard_t>::iterator i = ps->acting_recovery_backfill.begin();