diff options
| author | Greg Farnum <greg@inktank.com> | 2013-10-07 17:12:33 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-10-08 15:45:56 -0700 |
| commit | 8bfef62bfa3e0844498532a2b997605ea1638f00 (patch) | |
| tree | b7a51be604a20bd048e5d27ad99d6d4692ae9250 | |
| parent | 7a4eba05e4e8946ad2e0e2cf621ac51ad0aab558 (diff) | |
| download | ceph-8bfef62bfa3e0844498532a2b997605ea1638f00.tar.gz | |
ReplicatedPG: copy: rename CopyOp::version -> user_version
This version is a user version, and since we're in the OSD we
should call it such. (In particular, we may want to keep track
of the internal version too when doing cache promotes.)
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 8 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index cb39889d614..a1dcddad2ec 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4338,8 +4338,8 @@ void ReplicatedPG::_copy_some(ObjectContextRef obc, CopyOpRef cop) { dout(10) << __func__ << " " << obc << " " << cop << dendl; ObjectOperation op; - if (cop->version) { - op.assert_version(cop->version); + if (cop->user_version) { + op.assert_version(cop->user_version); } else { // we should learn the version after the first chunk, if we didn't know // it already! @@ -4358,7 +4358,7 @@ void ReplicatedPG::_copy_some(ObjectContextRef obc, CopyOpRef cop) new C_OnFinisher(fin, &osd->objecter_finisher), // discover the object version if we don't know it yet - cop->version ? NULL : &cop->version); + cop->user_version ? NULL : &cop->user_version); fin->tid = tid; cop->objecter_tid = tid; osd->objecter_lock.Unlock(); @@ -4503,7 +4503,7 @@ int ReplicatedPG::finish_copyfrom(OpContext *ctx) void ReplicatedPG::cancel_copy(CopyOpRef cop) { dout(10) << __func__ << " " << cop->obc->obs.oi.soid - << " from " << cop->src << " " << cop->oloc << " v" << cop->version + << " from " << cop->src << " " << cop->oloc << " v" << cop->user_version << dendl; // cancel objecter op, if we can diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 13c91df3d7d..b4259033eff 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -101,7 +101,7 @@ public: ObjectContextRef obc; hobject_t src; object_locator_t oloc; - version_t version; + version_t user_version; tid_t objecter_tid; @@ -119,7 +119,7 @@ public: CopyOp(CopyCallback *cb_, ObjectContextRef _obc, hobject_t s, object_locator_t l, version_t v, const hobject_t& dest) - : cb(cb_), obc(_obc), src(s), oloc(l), version(v), + : cb(cb_), obc(_obc), src(s), oloc(l), user_version(v), objecter_tid(0), size(0), rval(-1), |