@@ -297,6 +297,7 @@ extern const char *ceph_osd_state_name(int s);
\
/* tiering */ \
f(COPY_FROM, __CEPH_OSD_OP(WR, DATA, 26), "copy-from") \
+ f(COPY_FROM_NOTRUNC, __CEPH_OSD_OP(WR, DATA, 45), "copy-from-notrunc") \
/* was copy-get-classic */ \
f(UNDIRTY, __CEPH_OSD_OP(WR, DATA, 28), "undirty") \
f(ISDIRTY, __CEPH_OSD_OP(RD, DATA, 29), "isdirty") \
@@ -9919,7 +9919,8 @@ int OSD::init_op_flags(OpRequestRef& op)
(iter->op.op != CEPH_OSD_OP_RMXATTR) &&
(iter->op.op != CEPH_OSD_OP_STARTSYNC) &&
(iter->op.op != CEPH_OSD_OP_COPY_GET) &&
- (iter->op.op != CEPH_OSD_OP_COPY_FROM)) {
+ (iter->op.op != CEPH_OSD_OP_COPY_FROM) &&
+ (iter->op.op != CEPH_OSD_OP_COPY_FROM_NOTRUNC)) {
op->set_promote();
}
}
@@ -282,9 +282,11 @@ public:
PrimaryLogPG::CopyResults *results = nullptr;
PrimaryLogPG::OpContext *ctx;
OSDOp &osd_op;
+ uint32_t truncate_seq;
+ uint64_t truncate_size;
- CopyFromCallback(PrimaryLogPG::OpContext *ctx, OSDOp &osd_op)
- : ctx(ctx), osd_op(osd_op) {
+ CopyFromCallback(PrimaryLogPG::OpContext *ctx, OSDOp &osd_op, uint32_t seq, uint64_t size)
+ : ctx(ctx), osd_op(osd_op), truncate_seq(seq), truncate_size(size) {
}
~CopyFromCallback() override {}
@@ -292,6 +294,10 @@ public:
results = results_.get<1>();
int r = results_.get<0>();
+ if (osd_op.op.op != CEPH_OSD_OP_COPY_FROM_NOTRUNC) {
+ truncate_seq = results->truncate_seq;
+ truncate_size = results->truncate_size;
+ }
// for finish_copyfrom
ctx->user_at_version = results->user_version;
@@ -5668,6 +5674,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
case CEPH_OSD_OP_CACHE_TRY_FLUSH:
case CEPH_OSD_OP_UNDIRTY:
case CEPH_OSD_OP_COPY_FROM: // we handle user_version update explicitly
+ case CEPH_OSD_OP_COPY_FROM_NOTRUNC:
case CEPH_OSD_OP_CACHE_PIN:
case CEPH_OSD_OP_CACHE_UNPIN:
case CEPH_OSD_OP_SET_REDIRECT:
@@ -7664,17 +7671,24 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
}
break;
+ case CEPH_OSD_OP_COPY_FROM_NOTRUNC:
case CEPH_OSD_OP_COPY_FROM:
++ctx->num_write;
result = 0;
{
object_t src_name;
object_locator_t src_oloc;
+ uint32_t truncate_seq = 0;
+ uint64_t truncate_size = 0;
snapid_t src_snapid = (uint64_t)op.copy_from.snapid;
version_t src_version = op.copy_from.src_version;
try {
decode(src_name, bp);
decode(src_oloc, bp);
+ if (op.op == CEPH_OSD_OP_COPY_FROM_NOTRUNC) {
+ decode(truncate_seq, bp);
+ decode(truncate_size, bp);
+ }
}
catch (buffer::error& e) {
result = -EINVAL;
@@ -7714,7 +7728,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
result = -EINVAL;
break;
}
- CopyFromCallback *cb = new CopyFromCallback(ctx, osd_op);
+ CopyFromCallback *cb = new CopyFromCallback(ctx, osd_op, truncate_seq, truncate_size);
ctx->op_finishers[ctx->current_osd_subop_num].reset(
new CopyFromFinisher(cb));
start_copy(cb, ctx->obc, src, src_oloc, src_version,
@@ -9546,8 +9560,8 @@ void PrimaryLogPG::finish_copyfrom(CopyFromCallback *cb)
obs.oi.clear_omap_digest();
}
- obs.oi.truncate_seq = cb->results->truncate_seq;
- obs.oi.truncate_size = cb->results->truncate_size;
+ obs.oi.truncate_seq = cb->truncate_seq;
+ obs.oi.truncate_size = cb->truncate_size;
obs.oi.mtime = ceph::real_clock::to_timespec(cb->results->mtime);
ctx->mtime = utime_t();
The new 'copy-from-notrunc' is very similar to the 'copy-from' operation, except that it receives 2 extra parameters: truncate_seq and truncate_size. Signed-off-by: Luis Henriques <lhenriques@suse.com> --- src/include/rados.h | 1 + src/osd/OSD.cc | 3 ++- src/osd/PrimaryLogPG.cc | 24 +++++++++++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-)