OSD: add an op threadpool GenContext workqueue

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 429ea79f99bb9e81ba1021bbc4a2ae088cb9d2e6..fed6438501b2e062474743e64a1a7cc0f0c8c4df 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -188,7 +188,9 @@ OSDService::OSDService(OSD *osd) :
   scrub_wq(osd->scrub_wq),
   scrub_finalize_wq(osd->scrub_finalize_wq),
   rep_scrub_wq(osd->rep_scrub_wq),
-  recovery_gen_wq("gen_wq", cct->_conf->osd_recovery_thread_timeout, &osd->recovery_tp),
+  recovery_gen_wq("recovery_gen_wq", cct->_conf->osd_recovery_thread_timeout,
+                 &osd->recovery_tp),
+  op_gen_wq("op_gen_wq", cct->_conf->osd_recovery_thread_timeout, &osd->op_tp),
   class_handler(osd->class_handler),
   publish_lock("OSDService::publish_lock"),
   pre_publish_lock("OSDService::pre_publish_lock"),

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6a4032c3d56ad27ea4bee3a1c8bf1ed834406231..659053251367ef77d71e91900ea685bcb48c2544 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -329,6 +329,7 @@ public:
   ThreadPool::WorkQueue<PG> &scrub_finalize_wq;
   ThreadPool::WorkQueue<MOSDRepScrub> &rep_scrub_wq;
   GenContextWQ recovery_gen_wq;
+  GenContextWQ op_gen_wq;
   ClassHandler  *&class_handler;
 
   void dequeue_pg(PG *pg, list<OpRequestRef> *dequeued);