RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-21 01:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

objecter: normalize oloc.key

Browse Source 
If oloc.key == oid, clear it.  Users can set it to the oid or leave it
blank; they are equivalent.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-10-05 13:00:55 -07:00
parent a3316f4479
commit c4b51e30bb
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osdc/Objecter.cc
View File

@ -133,6 +133,8 @@ tid_t Objecter::linger(const object_t& oid, const object_locator_t& oloc,
LingerOp *info = new LingerOp;
info->oid = oid;
info->oloc = oloc;
if (info->oloc.key == oid)
info->oloc.key.clear();
info->snap = snap;
info->flags = flags;
info->ops = op.ops;

3
src/osdc/Objecter.h
View File

@ -391,6 +391,9 @@ public:
tid(0), attempts(0),
paused(false), objver(ov), reply_epoch(NULL) {
ops.swap(op);
if (oloc.key == o)
oloc.key.clear();
}
bool operator<(const Op& other) const {