From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 7 Apr 2016 20:40:45 +0000 (-0400)
Subject: test: fix memory leaks in rbd-mirror test cases
X-Git-Tag: v10.1.2~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8493%2Fhead;p=ceph.git

test: fix memory leaks in rbd-mirror test cases

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

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));