Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osd: use the sum of max allowed backfill and recovery as max_allowed #19036

Closed
wants to merge 1 commit into from
Closed

osd: use the sum of max allowed backfill and recovery as max_allowed #19036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion qa/suites/rados/singleton/all/recovery-preemption.yaml
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ tasks:
osd recovery sleep: .1
osd min pg log entries: 100
osd max pg log entries: 1000
osd recovery max active: 20
log-whitelist:
- \(POOL_APP_NOT_ENABLED\)
- \(OSDMAP_FLAGS\)
Expand All @@ -43,7 +44,7 @@ tasks:
- rados -p foo bench 3 write -b 4096 --no-cleanup
- ceph osd unset noup
- sleep 10
- for f in 0 1 2 3 ; do sudo ceph daemon osd.$f config set osd_recovery_sleep 0 ; sudo ceph daemon osd.$f config set osd_recovery_max_active 20 ; done
- for f in 0 1 2 3 ; do sudo ceph daemon osd.$f config set osd_recovery_sleep 0 ; sudo ceph daemon osd.$f config set osd_recovery_max_active 3 ; done
- ceph.healthy:
- exec:
osd.0:
Expand Down
18 changes: 13 additions & 5 deletions src/osd/OSD.cc
View file
Open in desktop
Expand Up @@ -246,9 +246,13 @@ OSDService::OSDService(OSD *osd) :
recovery_sleep_lock("OSDService::recovery_sleep_lock"),
recovery_sleep_timer(cct, recovery_sleep_lock, false),
reserver_finisher(cct),
local_reserver(cct, &reserver_finisher, cct->_conf->osd_max_backfills,
local_reserver(cct, &reserver_finisher,
(cct->_conf->osd_max_backfills +
cct->_conf->osd_recovery_max_active),
cct->_conf->osd_min_recovery_priority),
remote_reserver(cct, &reserver_finisher, cct->_conf->osd_max_backfills,
remote_reserver(cct, &reserver_finisher,
(cct->_conf->osd_max_backfills +
cct->_conf->osd_recovery_max_active),
cct->_conf->osd_min_recovery_priority),
pg_temp_lock("OSDService::pg_temp_lock"),
snap_sleep_lock("OSDService::snap_sleep_lock"),
Expand Down Expand Up @@ -9268,6 +9272,7 @@ const char** OSD::get_tracked_conf_keys() const
static const char* KEYS[] = {
"osd_max_backfills",
"osd_min_recovery_priority",
"osd_recovery_max_active",
"osd_max_trimming_pgs",
"osd_op_complaint_time",
"osd_op_log_threshold",
Expand Down Expand Up @@ -9305,9 +9310,12 @@ const char** OSD::get_tracked_conf_keys() const
void OSD::handle_conf_change(const struct md_config_t *conf,
const std::set <std::string> &changed)
{
if (changed.count("osd_max_backfills")) {
service.local_reserver.set_max(cct->_conf->osd_max_backfills);
service.remote_reserver.set_max(cct->_conf->osd_max_backfills);
if (changed.count("osd_max_backfills") ||
changed.count("osd_recovery_max_active")) {
auto max_allowed = (cct->_conf->osd_max_backfills +
cct->_conf->osd_recovery_max_active);
service.local_reserver.set_max(max_allowed);
service.remote_reserver.set_max(max_allowed);
}
if (changed.count("osd_min_recovery_priority")) {
service.local_reserver.set_min_priority(cct->_conf->osd_min_recovery_priority);
Expand Down
2 changes: 1 addition & 1 deletion src/osd/OSD.h
View file
Open in desktop
Expand Up @@ -831,7 +831,7 @@ class OSDService {
return (ceph_tid_t)last_tid++;
}

// -- backfill_reservation --
// -- recovery and backfill reservation --
Finisher reserver_finisher;
AsyncReserver<spg_t> local_reserver;
AsyncReserver<spg_t> remote_reserver;
Expand Down