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>

diff --cc src/include/interval_set.h
Simple merge

diff --cc src/osd/ECBackend.cc
index 3075fb82ec92a2cbe5c0f1f2e2420f47a3b12c8a,a29e2a3a84cf6fd9e2cc229166f53c8eddbda55a..1564f410411c798eff550d87eb41bebec654108e
--- 1/src/osd/ECBackend.cc
--- 2/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;

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

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

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

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

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

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