osd/PGLog: fix inaccurate missing assert

Repair and EIO handling can add missing items after log.tail

Fixes: http://tracker.ceph.com/issues/20753
Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index d910bc7f56ad7afaac0c40a64edbeea49c86cbd7..9cefb916a0e623b6fb84755000233ba1238346a5 100644 (file)
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -1296,12 +1296,12 @@ public:
          for (auto &&i: missing.get_items()) {
            if (checked.count(i.first))
              continue;
-           if (i.second.need > log.tail ||
-             i.first > info.last_backfill) {
-             ldpp_dout(dpp, -1) << __func__ << ": invalid missing set entry found "
-                                << i.first << " " << i.second << " log tail = "
-                                << log.tail << " last_backfill = " << info.last_backfill
-                                << dendl;
+           if (i.first > info.last_backfill) {
+             ldpp_dout(dpp, -1) << __func__ << ": invalid missing set entry "
+                               << "found before last_backfill: "
+                               << i.first << " " << i.second
+                               << " last_backfill = " << info.last_backfill
+                               << dendl;
              assert(0 == "invalid missing set entry found");
            }
            bufferlist bv;