Merge pull request #5442 from ceph/wip-12551

ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.h
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/osdc/Objecter.h
index d4d269dfc4f6b4b56c9c7fc8c0544fcce951a5e7,038e5f3b6e6c63aacfcd76672a9f6c58d7105d3b..1a985789955336fc8cfdf4b6bf7020354086110e
--- 1/src/osdc/Objecter.h
--- 2/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@@ -652,10 -656,12 +656,13 @@@ struct ObjectOperation 
        out_attrs(a), out_data(d), out_omap_header(oh),
        out_omap_data(o), out_snaps(osnaps), out_snap_seq(osnap_seq),
        out_flags(flags), out_data_digest(dd), out_omap_digest(od),
-         out_reqids(oreqids), prval(r) {}
+         out_reqids(oreqids),
+         out_truncate_seq(otseq),
+         out_truncate_size(otsize),
+         prval(r) {}
      void finish(int r) {
 -      if (r < 0)
 +      // reqids are copied on ENOENT
 +      if (r < 0 && r != -ENOENT)
        return;
        try {
        bufferlist::iterator p = bl.begin();