From b5bff49a58ae36fb88edd02f8f013b5a1622bf27 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 13 Aug 2020 13:29:46 -0700 Subject: [PATCH] *: convert more blacklist to blocklist Signed-off-by: Patrick Donnelly --- src/pybind/cephfs/cephfs.pyx | 2 +- .../librbd/exclusive_lock/test_mock_PreReleaseRequest.cc | 2 +- src/test/librbd/test_mock_Watcher.cc | 2 +- src/test/librbd/watcher/test_mock_RewatchRequest.cc | 2 +- .../rbd_mirror/image_deleter/test_mock_TrashWatcher.cc | 8 ++++---- src/test/rbd_mirror/test_mock_PoolWatcher.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx index 7de9feb1c55f7..d541e00ef6917 100644 --- a/src/pybind/cephfs/cephfs.pyx +++ b/src/pybind/cephfs/cephfs.pyx @@ -2582,7 +2582,7 @@ cdef class LibCephFS(object): """ Get the amount of time that the client has to return caps - In the event that a client does not return its caps, the MDS may blacklist + In the event that a client does not return its caps, the MDS may blocklist it after this timeout. Applications should check this value and ensure that they set the delegation timeout to a value lower than this. """ diff --git a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc index b30b1a3b6c544..2381278a87c12 100644 --- a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc +++ b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc @@ -290,7 +290,7 @@ TEST_F(TestMockExclusiveLockPreReleaseRequest, SuccessObjectMapDisabled) { ASSERT_EQ(0, ctx.wait()); } -TEST_F(TestMockExclusiveLockPreReleaseRequest, Blacklisted) { +TEST_F(TestMockExclusiveLockPreReleaseRequest, Blocklisted) { REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK); librbd::ImageCtx *ictx; diff --git a/src/test/librbd/test_mock_Watcher.cc b/src/test/librbd/test_mock_Watcher.cc index 8aa746b71632c..97f7757405386 100644 --- a/src/test/librbd/test_mock_Watcher.cc +++ b/src/test/librbd/test_mock_Watcher.cc @@ -279,7 +279,7 @@ TEST_F(TestMockWatcher, ReregisterWatchError) { ASSERT_EQ(0, unregister_ctx.wait()); } -TEST_F(TestMockWatcher, ReregisterWatchBlacklist) { +TEST_F(TestMockWatcher, ReregisterWatchBlocklist) { librbd::ImageCtx *ictx; ASSERT_EQ(0, open_image(m_image_name, &ictx)); diff --git a/src/test/librbd/watcher/test_mock_RewatchRequest.cc b/src/test/librbd/watcher/test_mock_RewatchRequest.cc index 77f6cb8ee3d46..9e7c5e0230514 100644 --- a/src/test/librbd/watcher/test_mock_RewatchRequest.cc +++ b/src/test/librbd/watcher/test_mock_RewatchRequest.cc @@ -121,7 +121,7 @@ TEST_F(TestMockWatcherRewatchRequest, UnwatchError) { ASSERT_EQ(234U, m_watch_handle); } -TEST_F(TestMockWatcherRewatchRequest, WatchBlacklist) { +TEST_F(TestMockWatcherRewatchRequest, WatchBlocklist) { librbd::ImageCtx *ictx; ASSERT_EQ(0, open_image(m_image_name, &ictx)); diff --git a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc index 017923c76a04a..a612dec149610 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc @@ -292,7 +292,7 @@ TEST_F(TestMockImageDeleterTrashWatcher, Notify) { ASSERT_EQ(0, when_shut_down(mock_trash_watcher)); } -TEST_F(TestMockImageDeleterTrashWatcher, CreateBlacklist) { +TEST_F(TestMockImageDeleterTrashWatcher, CreateBlocklist) { MockThreads mock_threads(m_threads); expect_work_queue(mock_threads); @@ -355,7 +355,7 @@ TEST_F(TestMockImageDeleterTrashWatcher, CreateError) { ASSERT_EQ(0, when_shut_down(mock_trash_watcher)); } -TEST_F(TestMockImageDeleterTrashWatcher, RegisterWatcherBlacklist) { +TEST_F(TestMockImageDeleterTrashWatcher, RegisterWatcherBlocklist) { MockThreads mock_threads(m_threads); expect_work_queue(mock_threads); @@ -405,7 +405,7 @@ TEST_F(TestMockImageDeleterTrashWatcher, RegisterWatcherError) { ASSERT_EQ(0, when_shut_down(mock_trash_watcher)); } -TEST_F(TestMockImageDeleterTrashWatcher, TrashListBlacklist) { +TEST_F(TestMockImageDeleterTrashWatcher, TrashListBlocklist) { MockThreads mock_threads(m_threads); expect_work_queue(mock_threads); @@ -488,7 +488,7 @@ TEST_F(TestMockImageDeleterTrashWatcher, Rewatch) { ASSERT_EQ(0, when_shut_down(mock_trash_watcher)); } -TEST_F(TestMockImageDeleterTrashWatcher, RewatchBlacklist) { +TEST_F(TestMockImageDeleterTrashWatcher, RewatchBlocklist) { MockThreads mock_threads(m_threads); expect_work_queue(mock_threads); diff --git a/src/test/rbd_mirror/test_mock_PoolWatcher.cc b/src/test/rbd_mirror/test_mock_PoolWatcher.cc index bac80599fade8..44efc0532d812 100644 --- a/src/test/rbd_mirror/test_mock_PoolWatcher.cc +++ b/src/test/rbd_mirror/test_mock_PoolWatcher.cc @@ -428,7 +428,7 @@ TEST_F(TestMockPoolWatcher, Notify) { ASSERT_EQ(0, when_shut_down(mock_pool_watcher)); } -TEST_F(TestMockPoolWatcher, RegisterWatcherBlacklist) { +TEST_F(TestMockPoolWatcher, RegisterWatcherBlocklist) { MockThreads mock_threads(m_threads); expect_work_queue(mock_threads); -- 2.39.5