ReplicatedPG::agent_load_hit_sets: take ondisk_read_lock

Otherwise, the hit_set might be not yet written due to a recently
completed recovery.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index e62649e92372128b218e954e61fd1f0f4c1423b7..9e65d22ae23d1842b259082a06c38443ed803a34 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10903,9 +10903,19 @@ void ReplicatedPG::agent_load_hit_sets()
          break;
        }
 
+       ObjectContextRef obc = get_object_context(oid, false);
+       if (!obc) {
+         derr << __func__ << ": could not load hitset " << oid << dendl;
+         break;
+       }
+
        bufferlist bl;
-       int r = osd->store->read(coll, oid, 0, 0, bl);
-       assert(r >= 0);
+       {
+         obc->ondisk_read_lock();
+         int r = osd->store->read(coll, oid, 0, 0, bl);
+         assert(r >= 0);
+         obc->ondisk_read_unlock();
+       }
        HitSetRef hs(new HitSet);
        bufferlist::iterator pbl = bl.begin();
        ::decode(*hs, pbl);