diff options
| author | Jason Dillaman <dillaman@redhat.com> | 2016-03-13 04:13:11 +0100 |
|---|---|---|
| committer | Jason Dillaman <dillaman@redhat.com> | 2016-03-13 04:40:17 +0100 |
| commit | e2bbd17a02257a468bc5052dc1c30c8e812ccd96 (patch) | |
| tree | 4a2f06b50d60b484157b032197e3b5955180eeac /src/test/rbd_mirror/test_ImageSync.cc | |
| parent | rbd-mirror: update object map while performing image sync (diff) | |
| download | ceph-e2bbd17a02257a468bc5052dc1c30c8e812ccd96.tar.xz ceph-e2bbd17a02257a468bc5052dc1c30c8e812ccd96.zip | |
test: verify proper update of object map during rbd-mirror image sync
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'src/test/rbd_mirror/test_ImageSync.cc')
| -rw-r--r-- | src/test/rbd_mirror/test_ImageSync.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/test/rbd_mirror/test_ImageSync.cc b/src/test/rbd_mirror/test_ImageSync.cc index 7846fcae492..10622a15856 100644 --- a/src/test/rbd_mirror/test_ImageSync.cc +++ b/src/test/rbd_mirror/test_ImageSync.cc @@ -44,9 +44,6 @@ public: create_and_open(m_local_io_ctx, &m_local_image_ctx); create_and_open(m_remote_io_ctx, &m_remote_image_ctx); - m_threads = new rbd::mirror::Threads(reinterpret_cast<CephContext*>( - m_local_io_ctx.cct())); - m_remote_journaler = new ::journal::Journaler( m_threads->work_queue, m_threads->timer, &m_threads->timer_lock, m_remote_io_ctx, m_remote_image_ctx->id, "mirror-uuid", 5); @@ -60,11 +57,6 @@ public: ASSERT_EQ(0, m_remote_journaler->register_client(client_data_bl)); } - virtual void TearDown() { - delete m_threads; - TestFixture::TearDown(); - } - void create_and_open(librados::IoCtx &io_ctx, librbd::ImageCtx **image_ctx) { librbd::RBD rbd; ASSERT_EQ(0, create_image(rbd, io_ctx, m_image_name, m_image_size)); @@ -90,8 +82,6 @@ public: librbd::ImageCtx *m_local_image_ctx; ::journal::Journaler *m_remote_journaler; librbd::journal::MirrorPeerClientMeta m_client_meta; - - rbd::mirror::Threads *m_threads = nullptr; }; TEST_F(TestImageSync, Empty) { |