From 9da4d40ecc7ce6f1a4ce0eba1c6fbfa8b2ff5d2c Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 21 Feb 2014 13:25:36 -0800 Subject: [PATCH] PGLog: test for missing using the correct shard value Signed-off-by: Samuel Just --- src/osd/PGLog.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index c6b391521a053..113bdd213ac52 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -782,7 +782,11 @@ bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid, if (i->is_delete()) continue; bufferlist bv; - int r = store->getattr(coll, i->soid, OI_ATTR, bv); + int r = store->getattr( + coll, + ghobject_t(i->soid, ghobject_t::NO_GEN, info.pgid.shard), + OI_ATTR, + bv); if (r >= 0) { object_info_t oi(bv); if (oi.version < i->version) { @@ -803,7 +807,11 @@ bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid, if (did.count(i->second)) continue; did.insert(i->second); bufferlist bv; - int r = store->getattr(coll, i->second, OI_ATTR, bv); + int r = store->getattr( + coll, + ghobject_t(i->second, ghobject_t::NO_GEN, info.pgid.shard), + OI_ATTR, + bv); if (r >= 0) { object_info_t oi(bv); /** -- 2.39.5