import 15.2.5

[ceph.git] / ceph / src / osd / PeeringState.cc

diff --git a/ceph/src/osd/PeeringState.cc b/ceph/src/osd/PeeringState.cc
index 5a49aaf4514e94c02f786dfd7949740f7f577bfa..47ba7d3614cd71f3b61755b17c2993a3bab9db76 100644 (file)
--- a/ceph/src/osd/PeeringState.cc
+++ b/ceph/src/osd/PeeringState.cc
@@ -3089,6 +3089,20 @@ void PeeringState::merge_from(
               << sources.begin()->second->info.history
               << dendl;
 
+    // above we have pulled down source's history and we need to check
+    // history.epoch_created again to confirm that source is not a placeholder
+    // too. (peering requires a sane history.same_interval_since value for any
+    // non-newly created pg and below here we know we are basically iterating
+    // back a series of past maps to fake a merge process, hence we need to
+    // fix history.same_interval_since first so that start_peering_interval()
+    // will not complain)
+    if (info.history.epoch_created == 0) {
+      dout(10) << __func__ << " both merge target and source are placeholders,"
+               << " set sis to lec " << info.history.last_epoch_clean
+               << dendl;
+      info.history.same_interval_since = info.history.last_epoch_clean;
+    }
+
     // if the past_intervals start is later than last_epoch_clean, it
     // implies the source repeered again but the target didn't, or
     // that the source became clean in a later epoch than the target.
@@ -3270,7 +3284,8 @@ void PeeringState::update_calc_stats()
       // Primary should not be in the peer_info, skip if it is.
       if (peer.first == pg_whoami) continue;
       int64_t missing = 0;
-      int64_t peer_num_objects = peer.second.stats.stats.sum.num_objects;
+      int64_t peer_num_objects =
+        std::max((int64_t)0, peer.second.stats.stats.sum.num_objects);
       // Backfill targets always track num_objects accurately
       // all other peers track missing accurately.
       if (is_backfill_target(peer.first)) {