Merge pull request #12306 from athanatos/wip-ec-scrub

osd: fix ec scrub errors

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

diff --cc src/osd/ECBackend.cc
index 8d409bbed89ee041e2a02584c455d02be0fbef59,7973dad39b7172d43253e157dde6ae09a992afa5..3075fb82ec92a2cbe5c0f1f2e2420f47a3b12c8a
--- 1/src/osd/ECBackend.cc
--- 2/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@@ -1780,12 -1786,11 +1781,13 @@@ bool ECBackend::try_state_to_reads(
    dout(10) << __func__ << ": " << *op << dendl;
  
    if (!op->remote_read.empty()) {
+     assert(get_parent()->get_pool().is_hacky_ecoverwrites());
      objects_read_async_no_cache(
        op->remote_read,
 -      [this, op](hobject_t::bitwisemap<extent_map> &&results) {
 -      op->remote_read_result = std::move(results);
 +      [this, op](hobject_t::bitwisemap<pair<int, extent_map> > &&results) {
 +      for (auto &&i: results) {
 +        op->remote_read_result.emplace(i.first, i.second.second);
 +      }
        check_ops();
        });
    }

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