From 0206e15b7470116240c7ffd6907b925dc69cad4f Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Fri, 11 Nov 2016 11:31:44 +0530 Subject: [PATCH] librbd / ObjectMap: use data_ctx/md_ctx pool context as required Signed-off-by: Venky Shankar --- src/librbd/operation/ObjectMapIterate.cc | 2 +- src/test/librbd/test_ObjectMap.cc | 12 ++++++------ src/test/librbd/test_internal.cc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/librbd/operation/ObjectMapIterate.cc b/src/librbd/operation/ObjectMapIterate.cc index 87fab84465e..229a585d2a0 100644 --- a/src/librbd/operation/ObjectMapIterate.cc +++ b/src/librbd/operation/ObjectMapIterate.cc @@ -38,7 +38,7 @@ public: m_handle_mismatch(handle_mismatch), m_invalidate(invalidate) { - m_io_ctx.dup(image_ctx->md_ctx); + m_io_ctx.dup(image_ctx->data_ctx); m_io_ctx.snap_set_read(CEPH_SNAPDIR); } diff --git a/src/test/librbd/test_ObjectMap.cc b/src/test/librbd/test_ObjectMap.cc index b3b19e45ccd..ea2977b67be 100644 --- a/src/test/librbd/test_ObjectMap.cc +++ b/src/test/librbd/test_ObjectMap.cc @@ -41,7 +41,7 @@ TEST_F(TestObjectMap, RefreshInvalidatesWhenCorrupt) { std::string oid = librbd::ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP); bufferlist bl; bl.append("corrupt"); - ASSERT_EQ(0, ictx->data_ctx.write_full(oid, bl)); + ASSERT_EQ(0, ictx->md_ctx.write_full(oid, bl)); ASSERT_EQ(0, when_open_object_map(ictx)); ASSERT_TRUE(ictx->test_flags(RBD_FLAG_OBJECT_MAP_INVALID)); @@ -65,7 +65,7 @@ TEST_F(TestObjectMap, RefreshInvalidatesWhenTooSmall) { librbd::cls_client::object_map_resize(&op, 0, OBJECT_NONEXISTENT); std::string oid = librbd::ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP); - ASSERT_EQ(0, ictx->data_ctx.operate(oid, &op)); + ASSERT_EQ(0, ictx->md_ctx.operate(oid, &op)); ASSERT_EQ(0, when_open_object_map(ictx)); ASSERT_TRUE(ictx->test_flags(RBD_FLAG_OBJECT_MAP_INVALID)); @@ -88,7 +88,7 @@ TEST_F(TestObjectMap, InvalidateFlagOnDisk) { std::string oid = librbd::ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP); bufferlist bl; bl.append("corrupt"); - ASSERT_EQ(0, ictx->data_ctx.write_full(oid, bl)); + ASSERT_EQ(0, ictx->md_ctx.write_full(oid, bl)); ASSERT_EQ(0, when_open_object_map(ictx)); ASSERT_TRUE(ictx->test_flags(RBD_FLAG_OBJECT_MAP_INVALID)); @@ -106,16 +106,16 @@ TEST_F(TestObjectMap, InvalidateFlagInMemoryOnly) { std::string oid = librbd::ObjectMap::object_map_name(ictx->id, CEPH_NOSNAP); bufferlist valid_bl; - ASSERT_LT(0, ictx->data_ctx.read(oid, valid_bl, 0, 0)); + ASSERT_LT(0, ictx->md_ctx.read(oid, valid_bl, 0, 0)); bufferlist corrupt_bl; corrupt_bl.append("corrupt"); - ASSERT_EQ(0, ictx->data_ctx.write_full(oid, corrupt_bl)); + ASSERT_EQ(0, ictx->md_ctx.write_full(oid, corrupt_bl)); ASSERT_EQ(0, when_open_object_map(ictx)); ASSERT_TRUE(ictx->test_flags(RBD_FLAG_OBJECT_MAP_INVALID)); - ASSERT_EQ(0, ictx->data_ctx.write_full(oid, valid_bl)); + ASSERT_EQ(0, ictx->md_ctx.write_full(oid, valid_bl)); ASSERT_EQ(0, open_image(m_image_name, &ictx)); ASSERT_FALSE(ictx->test_flags(RBD_FLAG_OBJECT_MAP_INVALID)); } diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc index 1a754b49980..0dea0f4922f 100644 --- a/src/test/librbd/test_internal.cc +++ b/src/test/librbd/test_internal.cc @@ -515,7 +515,7 @@ TEST_F(TestInternal, SnapshotCopyup) ASSERT_EQ(256, ictx2->aio_work_queue->write(256, bl.length(), bl.c_str(), 0)); librados::IoCtx snap_ctx; - snap_ctx.dup(m_ioctx); + snap_ctx.dup(ictx2->data_ctx); snap_ctx.snap_set_read(CEPH_SNAPDIR); librados::snap_set_t snap_set; -- 2.39.5