diff options
| author | Greg Farnum <greg@inktank.com> | 2013-08-30 16:33:31 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-09-09 17:21:32 -0700 |
| commit | 82e40a7d86ffede1ffa042c3100808e42372701c (patch) | |
| tree | 04216b02eecdf0fdee3174fa3a1bcc1c6a20dfb9 | |
| parent | a9a516a299005cd5cdfe2c52f3e657d4f985a593 (diff) | |
| download | ceph-82e40a7d86ffede1ffa042c3100808e42372701c.tar.gz | |
ReplicatedPG: do not meaninglessly fill in the reqid on make_writeable() cloning
This reqid is used to fill in a map that is used for giving clients
the correct version on replayed ops, unless the reqid is blank (in
which case it doesn't go into the map). Indirect clones are not ops
that the client wants to observe and the version is incorrect right now,
so don't fill it in.
Note that this should not have actually caused any buggy behavior, because
the map would have simply been overwritten by the real requested event
a short time later (while still protected by locks and things). But it's
very confusing.
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2c96180b13a..a4c725a90a8 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3772,7 +3772,7 @@ void ReplicatedPG::make_writeable(OpContext *ctx) ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::CLONE, coid, ctx->at_version, ctx->obs->oi.version, ctx->obs->oi.user_version, - ctx->reqid, ctx->new_obs.oi.mtime)); + osd_reqid_t(), ctx->new_obs.oi.mtime)); ::encode(snaps, ctx->log.back().snaps); ctx->at_version.version++; |