]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: make non-empty PastIntervals non-fatal 15639/head
authorSage Weil <sage@redhat.com>
Mon, 12 Jun 2017 19:40:49 +0000 (15:40 -0400)
committerSage Weil <sage@redhat.com>
Mon, 12 Jun 2017 19:40:49 +0000 (15:40 -0400)
Yes, we should not have past intervals in this case.  However, we don't
need to crash the OSD; the ERR in clog is sufficient to fail the teuthology
run, and users in production don't actually care.

See: http://tracker.ceph.com/issues/20167
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.cc

index c186548a6c69ba334b6e8fd222c7c3752543320f..cea01f320028e507db03894c2428af592f7ed100 100644 (file)
@@ -799,7 +799,6 @@ void PG::check_past_interval_bounds() const
       derr << info.pgid << " required past_interval bounds are"
           << " empty [" << rpib << ") but past_intervals is not: "
           << past_intervals << dendl;
-      assert(past_intervals.empty());
     }
   } else {
     if (past_intervals.empty()) {