osd/ReplicatedPG: fix bl resize on write vs truncate race

If we resize the write due to the funky truncate behavior, we need to
resize the bufferlist to match.

Fixes: #6346
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 9b4d069370bae2e8fe40bad13415201c80b2b4ff..e949c7a9b7f84e358b21579ca786ef69a72efec0 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2645,6 +2645,9 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
          op.extent.length = (op.extent.offset > oi.size ? 0 : oi.size - op.extent.offset);
          dout(10) << " old truncate_seq " << op.extent.truncate_seq << " < current " << seq
                   << ", adjusting write length to " << op.extent.length << dendl;
+         bufferlist t;
+         t.substr_of(osd_op.indata, 0, op.extent.length);
+         osd_op.indata.swap(t);
         }
        if (op.extent.truncate_seq > seq) {
          // write arrives before trimtrunc