From 08d2c8875bba7c41d1f9eeec586f6880f8be99b2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 21 Sep 2017 12:37:49 -0400 Subject: [PATCH] common/AsyncReserver: get a cct Signed-off-by: Sage Weil --- src/common/AsyncReserver.h | 5 ++++- src/osd/OSD.cc | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/AsyncReserver.h b/src/common/AsyncReserver.h index 28512ac800e..49a7dc48ddf 100644 --- a/src/common/AsyncReserver.h +++ b/src/common/AsyncReserver.h @@ -27,6 +27,7 @@ */ template class AsyncReserver { + CephContext *cct; Finisher *f; unsigned max_allowed; unsigned min_priority; @@ -55,10 +56,12 @@ class AsyncReserver { } public: AsyncReserver( + CephContext *cct, Finisher *f, unsigned max_allowed, unsigned min_priority = 0) - : f(f), + : cct(cct), + f(f), max_allowed(max_allowed), min_priority(min_priority), lock("AsyncReserver::lock") {} diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index cfb6ea7370d..73989c83576 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -247,9 +247,9 @@ OSDService::OSDService(OSD *osd) : recovery_sleep_lock("OSDService::recovery_sleep_lock"), recovery_sleep_timer(cct, recovery_sleep_lock, false), reserver_finisher(cct), - local_reserver(&reserver_finisher, cct->_conf->osd_max_backfills, + local_reserver(cct, &reserver_finisher, cct->_conf->osd_max_backfills, cct->_conf->osd_min_recovery_priority), - remote_reserver(&reserver_finisher, cct->_conf->osd_max_backfills, + remote_reserver(cct, &reserver_finisher, cct->_conf->osd_max_backfills, cct->_conf->osd_min_recovery_priority), pg_temp_lock("OSDService::pg_temp_lock"), snap_sleep_lock("OSDService::snap_sleep_lock"), @@ -258,7 +258,7 @@ OSDService::OSDService(OSD *osd) : scrub_sleep_lock("OSDService::scrub_sleep_lock"), scrub_sleep_timer( osd->client_messenger->cct, scrub_sleep_lock, false /* relax locking */), - snap_reserver(&reserver_finisher, + snap_reserver(cct, &reserver_finisher, cct->_conf->osd_max_trimming_pgs), recovery_lock("OSDService::recovery_lock"), recovery_ops_active(0), -- 2.39.5