osd: use blank reqid for snapdir events, too

Make reqid_is_indexed() less weird.

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 65eb07a3bfea8353f7eec590615c0a600f820d16..73947e4593fc4b7ac2460d7fc768bd4786f480b8 100644 (file)
--- 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 1167f849a424e496498c42911335afd97fc47afb..279d053efb0de8cb5c023309a3bcad700b89ea8b 100644 (file)
--- 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;