librbd: whitelisted_laggy_clients -> allowlisted_laggy_clients

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2020-06-17 14:44:55 -05:00 committed by Neha Ojha
parent ea404dc049
commit 5465c77d5f
3 changed files with 3 additions and 3 deletions

View File

@ -1095,7 +1095,7 @@ void JournalMetadata::schedule_laggy_clients_disconnect(Context *on_finish) {
for (auto &c : m_registered_clients) {
if (c.state == cls::journal::CLIENT_STATE_DISCONNECTED ||
c.id == m_client_id ||
m_settings.whitelisted_laggy_clients.count(c.id) > 0) {
m_settings.allowlisted_laggy_clients.count(c.id) > 0) {
continue;
}
const std::string &client_id = c.id;

View File

@ -12,7 +12,7 @@ struct Settings {
double commit_interval = 5; ///< commit position throttle (in secs)
uint64_t max_payload_bytes = 0; ///< 0 implies object size limit
int max_concurrent_object_sets = 0; ///< 0 implies no limit
std::set<std::string> whitelisted_laggy_clients;
std::set<std::string> allowlisted_laggy_clients;
///< clients that mustn't be disconnected
};

View File

@ -1120,7 +1120,7 @@ void Journal<I>::create_journaler() {
m_image_ctx.config.template get_val<uint64_t>("rbd_journal_max_concurrent_object_sets");
// TODO: a configurable filter to exclude certain peers from being
// disconnected.
settings.whitelisted_laggy_clients = {IMAGE_CLIENT_ID};
settings.allowlisted_laggy_clients = {IMAGE_CLIENT_ID};
m_journaler = new Journaler(m_work_queue, m_timer, m_timer_lock,
m_image_ctx.md_ctx, m_image_ctx.id,