From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Jul 2019 22:02:07 +0000 (-0500)
Subject: osd/PeeringState: do full on_new_interval on new peering interval
X-Git-Tag: v15.1.0~1379^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e87f1494ed5c881ff11b5732478fe7c64a16fde;p=ceph.git

osd/PeeringState: do full on_new_interval on new peering interval

This looks like a bug from the PeeringState transition.

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

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index a0f77b81eaf..4e511d6a406 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -637,7 +637,7 @@ void PeeringState::start_peering_interval(
     info.history.same_primary_since = osdmap->get_epoch();
   }
 
-  pl->on_new_interval();
+  on_new_interval();
   pl->on_info_history_change();
 
   psdout(1) << __func__ << " up " << oldup << " -> " << up
@@ -713,6 +713,7 @@ void PeeringState::start_peering_interval(
 
 void PeeringState::on_new_interval()
 {
+  dout(20) << __func__ << dendl;
   const OSDMapRef osdmap = get_osdmap();
 
   // initialize features