From c4f5de0058d65814ad91e8cd23c67987db9b9956 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 13 Aug 2020 13:16:43 -0700 Subject: [PATCH] *: convert EBLACKLISTED to EBLOCKLISTED Signed-off-by: Patrick Donnelly --- qa/tasks/cephfs/test_volume_client.py | 2 +- src/journal/JournalMetadata.cc | 2 +- src/librbd/Operations.cc | 2 +- src/librbd/cache/ObjectCacherObjectDispatch.cc | 2 +- src/librbd/exclusive_lock/PreReleaseRequest.cc | 2 +- src/librbd/watcher/RewatchRequest.cc | 2 +- src/mds/MDLog.cc | 2 +- src/mds/MDSContext.cc | 2 +- src/mds/MDSRank.cc | 2 +- src/mds/MDSTable.cc | 2 +- src/mds/PurgeQueue.cc | 2 +- src/mds/RecoveryQueue.cc | 2 +- .../deep_copy/test_mock_ObjectCopyRequest.cc | 4 ++-- .../exclusive_lock/test_mock_PreReleaseRequest.cc | 6 +++--- src/test/librbd/image/test_mock_RefreshRequest.cc | 4 ++-- src/test/librbd/io/test_mock_ObjectRequest.cc | 4 ++-- src/test/librbd/test_mock_Watcher.cc | 4 ++-- .../librbd/watcher/test_mock_RewatchRequest.cc | 4 ++-- .../image_deleter/test_mock_TrashWatcher.cc | 14 +++++++------- src/test/rbd_mirror/image_map/test_Policy.cc | 6 +++--- src/test/rbd_mirror/test_mock_ImageMap.cc | 2 +- src/test/rbd_mirror/test_mock_PoolWatcher.cc | 4 ++-- src/tools/rbd_mirror/image_deleter/TrashWatcher.cc | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qa/tasks/cephfs/test_volume_client.py b/qa/tasks/cephfs/test_volume_client.py index b7fd51dac47..e86f1dfa6fa 100644 --- a/qa/tasks/cephfs/test_volume_client.py +++ b/qa/tasks/cephfs/test_volume_client.py @@ -271,7 +271,7 @@ vc.disconnect() try: background.wait() except CommandFailedError: - # command failed with EBLACKLISTED? + # command failed with EBLOCKLISTED? if "transport endpoint shutdown" in background.stderr.getvalue(): pass else: diff --git a/src/journal/JournalMetadata.cc b/src/journal/JournalMetadata.cc index b03c851789f..4e5b71c4608 100644 --- a/src/journal/JournalMetadata.cc +++ b/src/journal/JournalMetadata.cc @@ -882,7 +882,7 @@ 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) { + } else if (r == -EBLOCKLISTED) { ldout(m_cct, 5) << __func__ << ": client blocklisted" << dendl; } else { lderr(m_cct) << __func__ << ": failed to watch journal: " diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc index 7342b4d2d64..c18259c67f7 100644 --- a/src/librbd/Operations.cc +++ b/src/librbd/Operations.cc @@ -234,7 +234,7 @@ struct C_InvokeAsyncRequest : public Context { ldout(cct, 20) << __func__ << ": r=" << r << dendl; if (r < 0) { - complete(r == -EBLACKLISTED ? -EBLACKLISTED : -EROFS); + complete(r == -EBLOCKLISTED ? -EBLOCKLISTED : -EROFS); return; } diff --git a/src/librbd/cache/ObjectCacherObjectDispatch.cc b/src/librbd/cache/ObjectCacherObjectDispatch.cc index 6dfec339368..0c0be29a91d 100644 --- a/src/librbd/cache/ObjectCacherObjectDispatch.cc +++ b/src/librbd/cache/ObjectCacherObjectDispatch.cc @@ -48,7 +48,7 @@ struct ObjectCacherObjectDispatch::C_InvalidateCache : public Context { ceph_assert(ceph_mutex_is_locked(dispatcher->m_cache_lock)); auto cct = dispatcher->m_image_ctx->cct; - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { lderr(cct) << "blocklisted during flush (purging)" << dendl; dispatcher->m_object_cacher->purge_set(dispatcher->m_object_set); } else if (r < 0 && purge_on_error) { diff --git a/src/librbd/exclusive_lock/PreReleaseRequest.cc b/src/librbd/exclusive_lock/PreReleaseRequest.cc index 11d4806de55..fe1e08fe74b 100644 --- a/src/librbd/exclusive_lock/PreReleaseRequest.cc +++ b/src/librbd/exclusive_lock/PreReleaseRequest.cc @@ -127,7 +127,7 @@ void PreReleaseRequest::handle_block_writes(int r) { CephContext *cct = m_image_ctx.cct; ldout(cct, 10) << "r=" << r << dendl; - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { // allow clean shut down if blocklisted lderr(cct) << "failed to block writes because client is blocklisted" << dendl; diff --git a/src/librbd/watcher/RewatchRequest.cc b/src/librbd/watcher/RewatchRequest.cc index 55d9133641a..b890cb3c503 100644 --- a/src/librbd/watcher/RewatchRequest.cc +++ b/src/librbd/watcher/RewatchRequest.cc @@ -57,7 +57,7 @@ void RewatchRequest::handle_unwatch(int r) { CephContext *cct = reinterpret_cast(m_ioctx.cct()); ldout(cct, 10) << "r=" << r << dendl; - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { lderr(cct) << "client blocklisted" << dendl; finish(r); return; diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index acc55a26455..4b1e32bed88 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -97,7 +97,7 @@ class C_MDL_WriteError : public MDSIOContextBase { MDSRank *mds = get_mds(); // assume journal is reliable, so don't choose action based on // g_conf()->mds_action_on_write_error. - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { derr << "we have been blocklisted (fenced), respawning..." << dendl; mds->respawn(); } else { diff --git a/src/mds/MDSContext.cc b/src/mds/MDSContext.cc index 447ef823553..c702d0253f7 100644 --- a/src/mds/MDSContext.cc +++ b/src/mds/MDSContext.cc @@ -107,7 +107,7 @@ void MDSIOContextBase::complete(int r) { return; } - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { derr << "MDSIOContextBase: blocklisted! Restarting..." << dendl; mds->respawn(); } else { diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index d1376dbe1d4..d2a301a5bd4 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -949,7 +949,7 @@ void MDSRank::damaged_unlocked() void MDSRank::handle_write_error(int err) { - if (err == -EBLACKLISTED) { + if (err == -EBLOCKLISTED) { derr << "we have been blocklisted (fenced), respawning..." << dendl; respawn(); return; diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index b0809f50e41..4d463186ac0 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -168,7 +168,7 @@ void MDSTable::load_2(int r, bufferlist& bl, Context *onfinish) { ceph_assert(is_opening()); state = STATE_ACTIVE; - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { mds->respawn(); return; } diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index bdb81166f46..7038d693007 100644 --- a/src/mds/PurgeQueue.cc +++ b/src/mds/PurgeQueue.cc @@ -595,7 +595,7 @@ void PurgeQueue::_execute_item( new LambdaContext([this, expire_to](int r){ std::lock_guard l(lock); - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { finisher.queue(on_error, r); on_error = nullptr; return; diff --git a/src/mds/RecoveryQueue.cc b/src/mds/RecoveryQueue.cc index 1abc6a2530a..18adeb281b4 100644 --- a/src/mds/RecoveryQueue.cc +++ b/src/mds/RecoveryQueue.cc @@ -188,7 +188,7 @@ void RecoveryQueue::_recovered(CInode *in, int r, uint64_t size, utime_t mtime) if (r != 0) { dout(0) << "recovery error! " << r << dendl; - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { mds->respawn(); return; } else { diff --git a/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc index 3c6db9057d2..48b732706fb 100644 --- a/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc @@ -940,10 +940,10 @@ TEST_F(TestMockDeepCopyObjectCopyRequest, ObjectMapUpdateError) { expect_write(mock_dst_io_ctx, 0, one.range_end(), {0, {}}, 0); expect_start_op(mock_exclusive_lock); expect_update_object_map(mock_dst_image_ctx, mock_object_map, - m_dst_snap_ids[0], OBJECT_EXISTS, -EBLACKLISTED); + m_dst_snap_ids[0], OBJECT_EXISTS, -EBLOCKLISTED); request->send(); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); } TEST_F(TestMockDeepCopyObjectCopyRequest, WriteSnapsStart) { diff --git a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc index d56ee1155f6..b30b1a3b6c5 100644 --- a/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc +++ b/src/test/librbd/exclusive_lock/test_mock_PreReleaseRequest.cc @@ -303,20 +303,20 @@ TEST_F(TestMockExclusiveLockPreReleaseRequest, Blacklisted) { expect_prepare_lock(mock_image_ctx); expect_cancel_op_requests(mock_image_ctx, 0); MockImageDispatch mock_image_dispatch; - expect_set_require_lock(mock_image_ctx, mock_image_dispatch, -EBLACKLISTED); + expect_set_require_lock(mock_image_ctx, mock_image_dispatch, -EBLOCKLISTED); cache::MockImageCache mock_image_cache; mock_image_ctx.image_cache = &mock_image_cache; MockShutdownRequest mock_shutdown_request; expect_close_image_cache(mock_image_ctx, mock_shutdown_request, 0); - expect_invalidate_cache(mock_image_ctx, -EBLACKLISTED); + expect_invalidate_cache(mock_image_ctx, -EBLOCKLISTED); expect_flush_notifies(mock_image_ctx); MockJournal mock_journal; mock_image_ctx.journal = &mock_journal; - expect_close_journal(mock_image_ctx, mock_journal, -EBLACKLISTED); + expect_close_journal(mock_image_ctx, mock_journal, -EBLOCKLISTED); MockObjectMap mock_object_map; mock_image_ctx.object_map = &mock_object_map; diff --git a/src/test/librbd/image/test_mock_RefreshRequest.cc b/src/test/librbd/image/test_mock_RefreshRequest.cc index c032cb7f791..9a31eb91a32 100644 --- a/src/test/librbd/image/test_mock_RefreshRequest.cc +++ b/src/test/librbd/image/test_mock_RefreshRequest.cc @@ -1445,7 +1445,7 @@ TEST_F(TestMockImageRefreshRequest, OpenObjectMapError) { expect_apply_metadata(mock_image_ctx, 0); expect_get_group(mock_image_ctx, 0); expect_refresh_parent_is_required(mock_refresh_parent_request, false); - expect_open_object_map(mock_image_ctx, &mock_object_map, -EBLACKLISTED); + expect_open_object_map(mock_image_ctx, &mock_object_map, -EBLOCKLISTED); EXPECT_CALL(mock_image_ctx, rebuild_data_io_context()); C_SaferCond ctx; @@ -1453,7 +1453,7 @@ TEST_F(TestMockImageRefreshRequest, OpenObjectMapError) { &ctx); req->send(); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); ASSERT_EQ(nullptr, mock_image_ctx.object_map); } diff --git a/src/test/librbd/io/test_mock_ObjectRequest.cc b/src/test/librbd/io/test_mock_ObjectRequest.cc index 0803ec32d8d..abe30094105 100644 --- a/src/test/librbd/io/test_mock_ObjectRequest.cc +++ b/src/test/librbd/io/test_mock_ObjectRequest.cc @@ -1566,14 +1566,14 @@ TEST_F(TestMockIoObjectRequest, ObjectMapError) { expect_get_parent_overlap(mock_image_ctx, CEPH_NOSNAP, 0, 0); expect_object_may_exist(mock_image_ctx, 0, true); expect_object_map_update(mock_image_ctx, 0, 1, OBJECT_EXISTS, {}, true, - -EBLACKLISTED); + -EBLOCKLISTED); C_SaferCond ctx; auto req = MockObjectWriteRequest::create_write( &mock_image_ctx, 0, 0, std::move(bl), mock_image_ctx.snapc, 0, 0, std::nullopt, {}, &ctx); req->send(); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); } } // namespace io diff --git a/src/test/librbd/test_mock_Watcher.cc b/src/test/librbd/test_mock_Watcher.cc index 7b470d546c7..8aa746b7163 100644 --- a/src/test/librbd/test_mock_Watcher.cc +++ b/src/test/librbd/test_mock_Watcher.cc @@ -291,7 +291,7 @@ TEST_F(TestMockWatcher, ReregisterWatchBlacklist) { InSequence seq; expect_aio_watch(mock_image_ctx, 0); expect_aio_unwatch(mock_image_ctx, 0); - expect_aio_watch(mock_image_ctx, -EBLACKLISTED); + expect_aio_watch(mock_image_ctx, -EBLOCKLISTED); C_SaferCond register_ctx; mock_image_watcher.register_watch(®ister_ctx); @@ -299,7 +299,7 @@ TEST_F(TestMockWatcher, ReregisterWatchBlacklist) { ASSERT_EQ(0, register_ctx.wait()); ceph_assert(m_watch_ctx != nullptr); - m_watch_ctx->handle_error(0, -EBLACKLISTED); + m_watch_ctx->handle_error(0, -EBLOCKLISTED); // wait for recovery unwatch/watch ASSERT_TRUE(wait_for_watch(mock_image_ctx, 2)); diff --git a/src/test/librbd/watcher/test_mock_RewatchRequest.cc b/src/test/librbd/watcher/test_mock_RewatchRequest.cc index 5d3380954d9..77f6cb8ee3d 100644 --- a/src/test/librbd/watcher/test_mock_RewatchRequest.cc +++ b/src/test/librbd/watcher/test_mock_RewatchRequest.cc @@ -129,7 +129,7 @@ TEST_F(TestMockWatcherRewatchRequest, WatchBlacklist) { InSequence seq; expect_aio_unwatch(mock_image_ctx, 0); - expect_aio_watch(mock_image_ctx, -EBLACKLISTED); + expect_aio_watch(mock_image_ctx, -EBLOCKLISTED); C_SaferCond ctx; MockRewatchRequest *req = MockRewatchRequest::create(mock_image_ctx.md_ctx, @@ -142,7 +142,7 @@ TEST_F(TestMockWatcherRewatchRequest, WatchBlacklist) { std::unique_lock watch_locker{m_watch_lock}; req->send(); } - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); ASSERT_EQ(0U, m_watch_handle); } 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 bd434b85f51..017923c76a0 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc @@ -297,14 +297,14 @@ TEST_F(TestMockImageDeleterTrashWatcher, CreateBlacklist) { expect_work_queue(mock_threads); InSequence seq; - expect_create_trash(m_local_io_ctx, -EBLACKLISTED); + expect_create_trash(m_local_io_ctx, -EBLOCKLISTED); MockListener mock_listener; MockTrashWatcher mock_trash_watcher(m_local_io_ctx, &mock_threads, mock_listener); C_SaferCond ctx; mock_trash_watcher.init(&ctx); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); MockLibrbdTrashWatcher mock_librbd_trash_watcher; expect_trash_watcher_unregister(mock_librbd_trash_watcher, 0); @@ -364,14 +364,14 @@ TEST_F(TestMockImageDeleterTrashWatcher, RegisterWatcherBlacklist) { MockLibrbdTrashWatcher mock_librbd_trash_watcher; expect_trash_watcher_is_unregistered(mock_librbd_trash_watcher, true); - expect_trash_watcher_register(mock_librbd_trash_watcher, -EBLACKLISTED); + expect_trash_watcher_register(mock_librbd_trash_watcher, -EBLOCKLISTED); MockListener mock_listener; MockTrashWatcher mock_trash_watcher(m_local_io_ctx, &mock_threads, mock_listener); C_SaferCond ctx; mock_trash_watcher.init(&ctx); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); expect_trash_watcher_unregister(mock_librbd_trash_watcher, 0); ASSERT_EQ(0, when_shut_down(mock_trash_watcher)); @@ -415,14 +415,14 @@ TEST_F(TestMockImageDeleterTrashWatcher, TrashListBlacklist) { MockLibrbdTrashWatcher mock_librbd_trash_watcher; expect_trash_watcher_is_unregistered(mock_librbd_trash_watcher, true); expect_trash_watcher_register(mock_librbd_trash_watcher, 0); - expect_trash_list(m_local_io_ctx, "", {}, -EBLACKLISTED); + expect_trash_list(m_local_io_ctx, "", {}, -EBLOCKLISTED); MockListener mock_listener; MockTrashWatcher mock_trash_watcher(m_local_io_ctx, &mock_threads, mock_listener); C_SaferCond ctx; mock_trash_watcher.init(&ctx); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); expect_trash_watcher_unregister(mock_librbd_trash_watcher, 0); ASSERT_EQ(0, when_shut_down(mock_trash_watcher)); @@ -507,7 +507,7 @@ TEST_F(TestMockImageDeleterTrashWatcher, RewatchBlacklist) { mock_trash_watcher.init(&ctx); ASSERT_EQ(0, ctx.wait()); - LibrbdTrashWatcher::get_instance().handle_rewatch_complete(-EBLACKLISTED); + LibrbdTrashWatcher::get_instance().handle_rewatch_complete(-EBLOCKLISTED); m_threads->work_queue->drain(); expect_trash_watcher_unregister(mock_librbd_trash_watcher, 0); diff --git a/src/test/rbd_mirror/image_map/test_Policy.cc b/src/test/rbd_mirror/image_map/test_Policy.cc index 4535ab7a59e..5f8bdd17fbe 100644 --- a/src/test/rbd_mirror/image_map/test_Policy.cc +++ b/src/test/rbd_mirror/image_map/test_Policy.cc @@ -223,7 +223,7 @@ TEST_F(TestImageMapPolicy, MapFailureAndUnmap) { &shuffle_global_image_ids); ASSERT_TRUE(shuffle_global_image_ids.empty()); - ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLACKLISTED)); + ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLOCKLISTED)); ASSERT_EQ(ACTION_TYPE_RELEASE, m_policy->start_action(global_image_id)); ASSERT_TRUE(m_policy->finish_action(global_image_id, -ENOENT)); @@ -278,7 +278,7 @@ TEST_F(TestImageMapPolicy, ReshuffleWithMapFailure) { m_policy->remove_instances({"9876"}, &shuffle_global_image_ids); ASSERT_TRUE(shuffle_global_image_ids.empty()); - ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLACKLISTED)); + ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLOCKLISTED)); ASSERT_EQ(ACTION_TYPE_RELEASE, m_policy->start_action(global_image_id)); ASSERT_TRUE(m_policy->finish_action(global_image_id, 0)); @@ -325,7 +325,7 @@ TEST_F(TestImageMapPolicy, ShuffleFailureAndRemove) { m_policy->remove_instances({"9876"}, &shuffle_global_image_ids); ASSERT_TRUE(shuffle_global_image_ids.empty()); - ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLACKLISTED)); + ASSERT_TRUE(m_policy->finish_action(global_image_id, -EBLOCKLISTED)); ASSERT_EQ(ACTION_TYPE_RELEASE, m_policy->start_action(global_image_id)); ASSERT_TRUE(m_policy->finish_action(global_image_id, 0)); diff --git a/src/test/rbd_mirror/test_mock_ImageMap.cc b/src/test/rbd_mirror/test_mock_ImageMap.cc index 3b4927bba7c..ac4ddb7923a 100644 --- a/src/test/rbd_mirror/test_mock_ImageMap.cc +++ b/src/test/rbd_mirror/test_mock_ImageMap.cc @@ -1226,7 +1226,7 @@ TEST_F(TestMockImageMap, RemoveInstanceWithRemoveImage) { remote_peer_ack_nowait(mock_image_map.get(), shuffled_global_image_ids, -ENOENT, &peer_ack_remove_ctxs); remote_peer_ack_wait(mock_image_map.get(), shuffled_global_image_ids, - -EBLACKLISTED, &peer_ack_ctxs); + -EBLOCKLISTED, &peer_ack_ctxs); wait_for_scheduled_task(); ASSERT_EQ(0, when_shut_down(mock_image_map.get())); diff --git a/src/test/rbd_mirror/test_mock_PoolWatcher.cc b/src/test/rbd_mirror/test_mock_PoolWatcher.cc index 317b2756395..bac80599fad 100644 --- a/src/test/rbd_mirror/test_mock_PoolWatcher.cc +++ b/src/test/rbd_mirror/test_mock_PoolWatcher.cc @@ -435,14 +435,14 @@ TEST_F(TestMockPoolWatcher, RegisterWatcherBlacklist) { InSequence seq; MockMirroringWatcher mock_mirroring_watcher; expect_mirroring_watcher_is_unregistered(mock_mirroring_watcher, true); - expect_mirroring_watcher_register(mock_mirroring_watcher, -EBLACKLISTED); + expect_mirroring_watcher_register(mock_mirroring_watcher, -EBLOCKLISTED); MockListener mock_listener(this); MockPoolWatcher mock_pool_watcher(&mock_threads, m_remote_io_ctx, "remote uuid", mock_listener); C_SaferCond ctx; mock_pool_watcher.init(&ctx); - ASSERT_EQ(-EBLACKLISTED, ctx.wait()); + ASSERT_EQ(-EBLOCKLISTED, ctx.wait()); ASSERT_TRUE(mock_pool_watcher.is_blocklisted()); expect_mirroring_watcher_unregister(mock_mirroring_watcher, 0); diff --git a/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc b/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc index beb64b66c9f..552d77e0e9f 100644 --- a/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc +++ b/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc @@ -95,7 +95,7 @@ template void TrashWatcher::handle_rewatch_complete(int r) { dout(5) << "r=" << r << dendl; - if (r == -EBLACKLISTED) { + if (r == -EBLOCKLISTED) { dout(0) << "detected client is blocklisted" << dendl; return; } else if (r == -ENOENT) { -- 2.39.5