update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / journal / JournalMetadata.cc

diff --git a/ceph/src/journal/JournalMetadata.cc b/ceph/src/journal/JournalMetadata.cc
index e2b3996fbc9b5e2c722e2c3d0a959441f9b0a2d4..bf04d4e1ccda888446a548048322bdd4a7ff0aa8 100644 (file)
--- a/ceph/src/journal/JournalMetadata.cc
+++ b/ceph/src/journal/JournalMetadata.cc
@@ -882,8 +882,8 @@ void JournalMetadata::handle_watch_reset() {
   if (r < 0) {
     if (r == -ENOENT) {
       ldout(m_cct, 5) << __func__ << ": journal header not found" << dendl;
-    } else if (r == -EBLACKLISTED) {
-      ldout(m_cct, 5) << __func__ << ": client blacklisted" << dendl;
+    } else if (r == -EBLOCKLISTED) {
+      ldout(m_cct, 5) << __func__ << ": client blocklisted" << dendl;
     } else {
       lderr(m_cct) << __func__ << ": failed to watch journal: "
                    << cpp_strerror(r) << dendl;
@@ -915,8 +915,8 @@ void JournalMetadata::handle_watch_notify(uint64_t notify_id, uint64_t cookie) {
 void JournalMetadata::handle_watch_error(int err) {
   if (err == -ENOTCONN) {
     ldout(m_cct, 5) << "journal watch error: header removed" << dendl;
-  } else if (err == -EBLACKLISTED) {
-    lderr(m_cct) << "journal watch error: client blacklisted" << dendl;
+  } else if (err == -EBLOCKLISTED) {
+    lderr(m_cct) << "journal watch error: client blocklisted" << dendl;
   } else {
     lderr(m_cct) << "journal watch error: " << cpp_strerror(err) << dendl;
   }
@@ -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.ignored_laggy_clients.count(c.id) > 0) {
         continue;
       }
       const std::string &client_id = c.id;