ReplicatedPG: tolerate ENOENT when statting.

This got broken in commit f842bcf893e42a4cefda07d0bbf86303b17ddcd7
so that on any MDS restart the OSD would die. Bad OSD! Bad!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 7c82b882d10a67594f5a352d1b1844d554dbb152..780e80945adf9f483396a83d182bd192633564e8 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1205,10 +1205,11 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
          struct stat st;
          memset(&st, 0, sizeof(st));
          result = osd->store->stat(coll, soid, &st);
-         if (result || (uint64_t)st.st_size != oi.size) {
+         if ((result && result != -ENOENT) ||
+             (uint64_t)st.st_size != oi.size) {
            osd->clog.error() << info.pgid << " " << soid << " oi.size " << oi.size
                              << " but stat got " << result << " size " << st.st_size << "\n";
-           assert(0 == "oi disagrees with stat");
+           assert(0 == "oi disagrees with stat, or error code on stat");
          }
        }
        info.stats.num_rd++;