From f6c482748395d3df7f1dbc42aaa59741577d22d1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 May 2010 16:11:10 -0700 Subject: [PATCH] osd: use blank reqid for snapdir events, too Make reqid_is_indexed() less weird. --- src/osd/PG.h | 2 +- src/osd/ReplicatedPG.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/PG.h b/src/osd/PG.h index 65eb07a3bfea8..73947e4593fc4 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -261,7 +261,7 @@ public: bool is_update() const { return is_clone() || is_modify() || is_backlog(); } bool reqid_is_indexed() const { - return reqid.tid && op != BACKLOG && op != CLONE && soid.snap != CEPH_SNAPDIR; + return reqid != osd_reqid_t() && op != BACKLOG && op != CLONE; } void encode(bufferlist &bl) const { diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 1167f849a424e..279d053efb0de 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1861,7 +1861,7 @@ int ReplicatedPG::prepare_transaction(OpContext *ctx) ctx->at_version.version++; ctx->log.push_back(Log::Entry(Log::Entry::DELETE, snapoid, ctx->at_version, old_version, - ctx->reqid, ctx->mtime)); + osd_reqid_t(), ctx->mtime)); ctx->snapset_obc->obs.exists = false; register_object_context(ctx->snapset_obc); @@ -1874,7 +1874,7 @@ int ReplicatedPG::prepare_transaction(OpContext *ctx) << " in " << snapoid << dendl; ctx->at_version.version++; ctx->log.push_back(Log::Entry(Log::Entry::MODIFY, snapoid, ctx->at_version, old_version, - ctx->reqid, ctx->mtime)); + osd_reqid_t(), ctx->mtime)); ctx->snapset_obc = get_object_context(snapoid, true); ctx->snapset_obc->obs.exists = true; -- 2.39.5