From ba04352b8f760e2e94d3b7851aa4a1c9f4f1b0fd Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sat, 4 Sep 2021 13:49:09 +0200 Subject: [PATCH] librbd: drop ValidatePoolRequest::m_op_work_queue It is unused now. Signed-off-by: Ilya Dryomov --- src/librbd/api/Pool.cc | 5 +--- src/librbd/image/CreateRequest.cc | 3 +-- src/librbd/image/ValidatePoolRequest.cc | 3 +-- src/librbd/image/ValidatePoolRequest.h | 7 ++---- .../image/test_mock_ValidatePoolRequest.cc | 24 +++++++------------ 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/src/librbd/api/Pool.cc b/src/librbd/api/Pool.cc index 890341e015c..65d55328fbb 100644 --- a/src/librbd/api/Pool.cc +++ b/src/librbd/api/Pool.cc @@ -252,11 +252,8 @@ int Pool::init(librados::IoCtx& io_ctx, bool force) { return 0; } - AsioEngine asio_engine(io_ctx); - C_SaferCond ctx; - auto req = image::ValidatePoolRequest::create( - io_ctx, asio_engine.get_work_queue(), &ctx); + auto req = image::ValidatePoolRequest::create(io_ctx, &ctx); req->send(); return ctx.wait(); diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc index dd0ab2fff8f..71fb9cf26d0 100644 --- a/src/librbd/image/CreateRequest.cc +++ b/src/librbd/image/CreateRequest.cc @@ -283,8 +283,7 @@ void CreateRequest::validate_data_pool() { auto ctx = create_context_callback< CreateRequest, &CreateRequest::handle_validate_data_pool>(this); - auto req = ValidatePoolRequest::create(m_data_io_ctx, m_op_work_queue, - ctx); + auto req = ValidatePoolRequest::create(m_data_io_ctx, ctx); req->send(); } diff --git a/src/librbd/image/ValidatePoolRequest.cc b/src/librbd/image/ValidatePoolRequest.cc index af41106bb10..6f2872e2562 100644 --- a/src/librbd/image/ValidatePoolRequest.cc +++ b/src/librbd/image/ValidatePoolRequest.cc @@ -31,10 +31,9 @@ using util::create_async_context_callback; template ValidatePoolRequest::ValidatePoolRequest(librados::IoCtx& io_ctx, - asio::ContextWQ *op_work_queue, Context *on_finish) : m_cct(reinterpret_cast(io_ctx.cct())), - m_op_work_queue(op_work_queue), m_on_finish(on_finish) { + m_on_finish(on_finish) { // validatation should occur in default namespace m_io_ctx.dup(io_ctx); m_io_ctx.set_namespace(""); diff --git a/src/librbd/image/ValidatePoolRequest.h b/src/librbd/image/ValidatePoolRequest.h index 859bf4e13e3..74f38441749 100644 --- a/src/librbd/image/ValidatePoolRequest.h +++ b/src/librbd/image/ValidatePoolRequest.h @@ -21,13 +21,11 @@ template class ValidatePoolRequest { public: static ValidatePoolRequest* create(librados::IoCtx& io_ctx, - asio::ContextWQ *op_work_queue, Context *on_finish) { - return new ValidatePoolRequest(io_ctx, op_work_queue, on_finish); + return new ValidatePoolRequest(io_ctx, on_finish); } - ValidatePoolRequest(librados::IoCtx& io_ctx, asio::ContextWQ *op_work_queue, - Context *on_finish); + ValidatePoolRequest(librados::IoCtx& io_ctx, Context *on_finish); void send(); @@ -62,7 +60,6 @@ private: librados::IoCtx m_io_ctx; CephContext* m_cct; - asio::ContextWQ* m_op_work_queue; Context* m_on_finish; int m_ret_val = 0; diff --git a/src/test/librbd/image/test_mock_ValidatePoolRequest.cc b/src/test/librbd/image/test_mock_ValidatePoolRequest.cc index 65460eab785..f5204ac2049 100644 --- a/src/test/librbd/image/test_mock_ValidatePoolRequest.cc +++ b/src/test/librbd/image/test_mock_ValidatePoolRequest.cc @@ -110,8 +110,7 @@ TEST_F(TestMockImageValidatePoolRequest, Success) { expect_write_rbd_info(mock_io_ctx, "overwrite validated", 0); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(0, ctx.wait()); } @@ -124,8 +123,7 @@ TEST_F(TestMockImageValidatePoolRequest, AlreadyValidated) { expect_read_rbd_info(mock_io_ctx, "overwrite validated", 0); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(0, ctx.wait()); } @@ -139,8 +137,7 @@ TEST_F(TestMockImageValidatePoolRequest, SnapshotsValidated) { expect_write_rbd_info(mock_io_ctx, "overwrite validated", 0); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(0, ctx.wait()); } @@ -153,8 +150,7 @@ TEST_F(TestMockImageValidatePoolRequest, ReadError) { expect_read_rbd_info(mock_io_ctx, "", -EPERM); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(-EPERM, ctx.wait()); } @@ -168,8 +164,7 @@ TEST_F(TestMockImageValidatePoolRequest, CreateSnapshotError) { expect_allocate_snap_id(mock_io_ctx, -EPERM); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(-EPERM, ctx.wait()); } @@ -185,8 +180,7 @@ TEST_F(TestMockImageValidatePoolRequest, WriteError) { expect_release_snap_id(mock_io_ctx, -EINVAL); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(-EPERM, ctx.wait()); } @@ -203,8 +197,7 @@ TEST_F(TestMockImageValidatePoolRequest, RemoveSnapshotError) { expect_write_rbd_info(mock_io_ctx, "overwrite validated", 0); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(0, ctx.wait()); } @@ -221,8 +214,7 @@ TEST_F(TestMockImageValidatePoolRequest, OverwriteError) { expect_write_rbd_info(mock_io_ctx, "overwrite validated", -EOPNOTSUPP); C_SaferCond ctx; - auto req = new MockValidatePoolRequest(m_ioctx, image_ctx->op_work_queue, - &ctx); + auto req = new MockValidatePoolRequest(m_ioctx, &ctx); req->send(); ASSERT_EQ(-EINVAL, ctx.wait()); }