From efccc58f1e5ea92ec23d6b808ff25782d2146280 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 2 Jul 2015 17:05:53 +0800 Subject: [PATCH] osd/ReplicatedPG: for writefull, offset is zero so replace offset w/ zero. Signed-off-by: Jianpeng Ma --- src/osd/ReplicatedPG.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 7312c8efea0f..20fe86792e41 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4228,13 +4228,13 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) case CEPH_OSD_OP_WRITEFULL: ++ctx->num_write; { // write full object - tracepoint(osd, do_osd_op_pre_writefull, soid.oid.name.c_str(), soid.snap.val, oi.size, op.extent.offset, op.extent.length); + tracepoint(osd, do_osd_op_pre_writefull, soid.oid.name.c_str(), soid.snap.val, oi.size, 0, op.extent.length); if (op.extent.length != osd_op.indata.length()) { result = -EINVAL; break; } - result = check_offset_and_length(op.extent.offset, op.extent.length, cct->_conf->osd_max_object_size); + result = check_offset_and_length(0, op.extent.length, cct->_conf->osd_max_object_size); if (result < 0) break; @@ -4250,7 +4250,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) } } ctx->mod_desc.create(); - t->append(soid, op.extent.offset, op.extent.length, osd_op.indata, op.flags); + t->append(soid, 0, op.extent.length, osd_op.indata, op.flags); if (obs.exists) { map to_set = ctx->obc->attr_cache; map > &overlay = @@ -4269,7 +4269,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) } } else { ctx->mod_desc.mark_unrollbackable(); - t->write(soid, op.extent.offset, op.extent.length, osd_op.indata, op.flags); + t->write(soid, 0, op.extent.length, osd_op.indata, op.flags); if (obs.exists && op.extent.length < oi.size) { t->truncate(soid, op.extent.length); } @@ -4278,9 +4278,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) obs.oi.set_data_digest(osd_op.indata.crc32c(-1)); write_update_size_and_usage(ctx->delta_stats, oi, ctx->modified_ranges, - op.extent.offset, op.extent.length, true, - op.extent.offset + op.extent.length != oi.size ? true : false); - + 0, op.extent.length, true, op.extent.length != oi.size ? true : false); } break; -- 2.47.3