From: Sage Weil <sage@redhat.com>
Date: Mon, 5 Dec 2016 16:45:07 +0000 (-0500)
Subject: Merge pull request #12305 from athanatos/wip-ec-rbd-fixes
X-Git-Tag: v11.1.0~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2041a187bfd36a71357c60f731aefd753b847622;p=ceph.git

Merge pull request #12305 from athanatos/wip-ec-rbd-fixes

osd: fixes to make rbd on ec work

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

2041a187bfd36a71357c60f731aefd753b847622
diff --cc src/osd/ECBackend.cc
index 3075fb82ec92,a29e2a3a84cf..1564f410411c
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@@ -1730,9 -1735,8 +1730,9 @@@ bool ECBackend::try_state_to_reads(
  
    Op *op = &(waiting_state.front());
    if (op->requires_rmw() && pipeline_state.cache_invalid()) {
 +    assert(get_parent()->get_pool().is_hacky_ecoverwrites());
      dout(20) << __func__ << ": blocking " << *op
- 	     << " because it requires an rmw and the cache is invalid"
+ 	     << " because it requires an rmw and the cache is invalid "
  	     << pipeline_state
  	     << dendl;
      return false;