osd: ec saves a write access to the memory under most circumstances

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index dc7f5aed793637d4cb5636dd110838a8697d9955..c20e10a25ac24b2ee05ed7610061f53cc05e51bd 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -1861,9 +1861,9 @@ bool ECBackend::try_state_to_reads()
     return false;
   }
 
-  op->using_cache = pipeline_state.caching_enabled();
-
-  if (op->invalidates_cache()) {
+  if (!pipeline_state.caching_enabled()) {
+    op->using_cache = false;
+  } else if (op->invalidates_cache()) {
     dout(20) << __func__ << ": invalidating cache after this op"
             << dendl;
     pipeline_state.invalidate();

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index 6784925df9ca532fee863483b420539e3754e0e2..89d5dcbcb5240f8bd6b6d31c76cfbc2435dc2daa 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -478,7 +478,7 @@ public:
     bool invalidates_cache() const { return plan.invalidates_cache; }
 
     // must be true if requires_rmw(), must be false if invalidates_cache()
-    bool using_cache = false;
+    bool using_cache = true;
 
     /// In progress read state;
     map<hobject_t,extent_set> pending_read; // subset already being read