From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Dec 2016 16:32:11 +0000 (-0500)
Subject: Merge pull request #12306 from athanatos/wip-ec-scrub
X-Git-Tag: v11.1.0~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=645119e7c9dde9e3d1e03f3408f85b9e145830d3;p=ceph.git

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

osd: fix ec scrub errors

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

645119e7c9dde9e3d1e03f3408f85b9e145830d3
diff --cc src/osd/ECBackend.cc
index 8d409bbed89e,7973dad39b71..3075fb82ec92
--- a/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();
        });
    }