diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-11 15:11:35 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-17 11:06:28 -0700 |
| commit | 045b90292abdc9ee04a152213bf8cd2cdf664005 (patch) | |
| tree | 92fcadc0cf79ead95c2b1d8ea014dd323fb90e97 | |
| parent | 83f12e46308844dc7a91e141f8428799777af34d (diff) | |
| download | ceph-045b90292abdc9ee04a152213bf8cd2cdf664005.tar.gz | |
osd: allow a copy_from without knowing the src_version
If we don't specify the version up front, learn the version after the first
chunk and enforce it thereafter to ensure we do not get torn content.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index ca747db90c6..141a176a0d1 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4132,7 +4132,13 @@ void ReplicatedPG::_copy_some(OpContext *ctx, CopyOpRef cop) { dout(10) << __func__ << " " << ctx << " " << cop << dendl; ObjectOperation op; - op.assert_version(cop->version); + if (cop->version) { + op.assert_version(cop->version); + } else { + // we should learn the version after the first chunk, if we didn't know + // it already! + assert(cop->cursor.is_initial()); + } op.copy_get(&cop->cursor, cct->_conf->osd_copyfrom_max_chunk, &cop->size, &cop->mtime, &cop->attrs, &cop->data, &cop->omap, @@ -4142,10 +4148,11 @@ void ReplicatedPG::_copy_some(OpContext *ctx, CopyOpRef cop) get_last_peering_reset()); osd->objecter_lock.Lock(); tid_t tid = osd->objecter->read(cop->src.oid, cop->oloc, op, - cop->src.snap, NULL, 0, - new C_OnFinisher(fin, - &osd->objecter_finisher), - NULL); + cop->src.snap, NULL, 0, + new C_OnFinisher(fin, + &osd->objecter_finisher), + // discover the object version if we don't know it yet + cop->version ? NULL : &cop->version); fin->tid = tid; cop->objecter_tid = tid; osd->objecter_lock.Unlock(); |