osd: decouple reads and recovery in ECBackend::check_recovery_sources()

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 4bc7695ebb16e33f52e7022be4a33e1538216083..3982c04414353bcdb34fe8c98e1fbbf461c548c9 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -1391,9 +1391,11 @@ struct FinishReadOp : public GenContext<ThreadPool::TPHandle&>  {
   }
 };
 
+template <class F>
 void ECBackend::ReadPipeline::filter_read_op(
   const OSDMapRef& osdmap,
-  ReadOp &op)
+  ReadOp &op,
+  F&& on_erase)
 {
   set<hobject_t> to_cancel;
   for (map<pg_shard_t, set<hobject_t> >::iterator i = op.source_to_obj.begin();
@@ -1443,8 +1445,7 @@ void ECBackend::ReadPipeline::filter_read_op(
 
     op.to_read.erase(*i);
     op.complete.erase(*i);
-    // TODO: meh, this doesn't look like a part of the read pipeline
-    //recovery_ops.erase(*i);
+    on_erase(*i);
   }
 
   if (op.in_progress.empty()) {
@@ -1470,17 +1471,19 @@ void ECBackend::ReadPipeline::filter_read_op(
   }
 }
 
-void ECBackend::check_recovery_sources(const OSDMapRef& osdmap)
+template <class F>
+void ECBackend::ReadPipeline::check_recovery_sources(
+  const OSDMapRef& osdmap,
+  F&& on_erase)
 {
-  // TODO: dissect into ReadPipeline
   set<ceph_tid_t> tids_to_filter;
   for (map<pg_shard_t, set<ceph_tid_t> >::iterator 
-       i = read_pipeline.shard_to_read_map.begin();
-       i != read_pipeline.shard_to_read_map.end();
+       i = shard_to_read_map.begin();
+       i != shard_to_read_map.end();
        ) {
     if (osdmap->is_down(i->first.osd)) {
       tids_to_filter.insert(i->second.begin(), i->second.end());
-      read_pipeline.shard_to_read_map.erase(i++);
+      shard_to_read_map.erase(i++);
     } else {
       ++i;
     }
@@ -1488,12 +1491,19 @@ void ECBackend::check_recovery_sources(const OSDMapRef& osdmap)
   for (set<ceph_tid_t>::iterator i = tids_to_filter.begin();
        i != tids_to_filter.end();
        ++i) {
-    map<ceph_tid_t, ReadOp>::iterator j = read_pipeline.tid_to_read_map.find(*i);
-    ceph_assert(j != read_pipeline.tid_to_read_map.end());
-    read_pipeline.filter_read_op(osdmap, j->second);
+    map<ceph_tid_t, ReadOp>::iterator j = tid_to_read_map.find(*i);
+    ceph_assert(j != tid_to_read_map.end());
+    filter_read_op(osdmap, j->second, on_erase);
   }
 }
 
+void ECBackend::check_recovery_sources(const OSDMapRef& osdmap)
+{
+  read_pipeline.check_recovery_sources(osdmap, [this] (const hobject_t& obj) {
+    recovery_ops.erase(obj);
+  });
+}
+
 void ECBackend::ReadPipeline::on_change()
 {
   for (map<ceph_tid_t, ReadOp>::iterator i = tid_to_read_map.begin();

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index b3951f664a8f1d81167978b991ed0e222a6ac410..94267144ba4cd62999cbeeaf8bd13257af9d2fb0 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -399,9 +399,14 @@ public:
       bool fast_read,
       GenContextURef<std::map<hobject_t,std::pair<int, extent_map> > &&> &&func);
 
+    template <class F>
     void filter_read_op(
       const OSDMapRef& osdmap,
-      ReadOp &op);
+      ReadOp &op,
+      F&& on_erase);
+
+    template <class F>
+    void check_recovery_sources(const OSDMapRef& osdmap, F&& on_erase);
 
     void complete_read_op(ReadOp &rop);