From: Sage Weil <sage@newdream.net>
Date: Wed, 17 Jun 2020 19:44:55 +0000 (-0500)
Subject: librbd: whitelisted_laggy_clients -> allowlisted_laggy_clients
X-Git-Tag: wip-pdonnell-testing-20200918.022351~271^2~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5465c77d5fb7cc509e1316d05de8d46513916bef;p=ceph-ci.git

librbd: whitelisted_laggy_clients -> allowlisted_laggy_clients

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/journal/JournalMetadata.cc b/src/journal/JournalMetadata.cc
index 7c24fd2999d..b03c851789f 100644
--- a/src/journal/JournalMetadata.cc
+++ b/src/journal/JournalMetadata.cc
@@ -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;
diff --git a/src/journal/Settings.h b/src/journal/Settings.h
index 1896ad5285a..c40ea57fc27 100644
--- a/src/journal/Settings.h
+++ b/src/journal/Settings.h
@@ -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
 };
 
diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index c38a5d82288..b4b53bafb88 100644
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -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,