From 492a572d609c664b3842f6f60a00f1c00688ed94 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 7 Apr 2016 16:40:45 -0400 Subject: [PATCH] test: fix memory leaks in rbd-mirror test cases Signed-off-by: Jason Dillaman --- src/test/rbd_mirror/test_ImageReplayer.cc | 7 +++++++ src/test/rbd_mirror/test_ImageSync.cc | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc index 10310f1d70c8..84e4afc22a4f 100644 --- a/src/test/rbd_mirror/test_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_ImageReplayer.cc @@ -104,6 +104,13 @@ public: ~TestImageReplayer() { + if (m_watch_handle != 0) { + m_remote_ioctx.unwatch2(m_watch_handle); + delete m_watch_ctx; + m_watch_ctx = nullptr; + m_watch_handle = 0; + } + delete m_replayer; delete m_threads; diff --git a/src/test/rbd_mirror/test_ImageSync.cc b/src/test/rbd_mirror/test_ImageSync.cc index e9b234e7db94..5e6b0a9d3101 100644 --- a/src/test/rbd_mirror/test_ImageSync.cc +++ b/src/test/rbd_mirror/test_ImageSync.cc @@ -58,6 +58,11 @@ public: ASSERT_EQ(0, m_remote_journaler->register_client(client_data_bl)); } + virtual void TearDown() { + TestFixture::TearDown(); + delete m_remote_journaler; + } + 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)); -- 2.47.3