test: avoid leaking librados connections when creating pools

Fixes: http://tracker.ceph.com/issues/15354
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/test/rbd_mirror/test_ClusterWatcher.cc b/src/test/rbd_mirror/test_ClusterWatcher.cc
index 1629a16f1328fc5b36bbb4d8240cebda87562ade..2d7d3f2717fc7495354c53ce1110011c92e0d5c6 100644 (file)
--- a/src/test/rbd_mirror/test_ClusterWatcher.cc
+++ b/src/test/rbd_mirror/test_ClusterWatcher.cc
@@ -45,7 +45,8 @@ public:
   void create_pool(bool enable_mirroring, const peer_t &peer,
                    string *uuid = nullptr, string *name=nullptr) {
     string pool_name = get_temp_pool_name("test-rbd-mirror-");
-    ASSERT_EQ("", create_one_pool_pp(pool_name, *m_cluster));
+    ASSERT_EQ(0, m_cluster->pool_create(pool_name.c_str()));
+
     int64_t pool_id = m_cluster->pool_lookup(pool_name.c_str());
     ASSERT_GE(pool_id, 0);
     m_pools.insert(pool_name);
@@ -84,7 +85,8 @@ public:
   void create_cache_pool(const string &base_pool, string *cache_pool_name) {
     bufferlist inbl;
     *cache_pool_name = get_temp_pool_name("test-rbd-mirror-");
-    ASSERT_EQ("", create_one_pool_pp(*cache_pool_name, *m_cluster));
+    ASSERT_EQ(0, m_cluster->pool_create(cache_pool_name->c_str()));
+
     ASSERT_EQ(0, m_cluster->mon_command(
       "{\"prefix\": \"osd tier add\", \"pool\": \"" + base_pool +
       "\", \"tierpool\": \"" + *cache_pool_name +

diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc
index 18f1441682afd271761376f5d6baa46b1fc4803c..10310f1d70c88b2aa7911861202a9f5f0d524b56 100644 (file)
--- a/src/test/rbd_mirror/test_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_ImageReplayer.cc
@@ -76,14 +76,14 @@ public:
     EXPECT_EQ("", connect_cluster_pp(m_local_cluster));
 
     m_local_pool_name = get_temp_pool_name();
-    EXPECT_EQ("", create_one_pool_pp(m_local_pool_name, m_local_cluster));
+    EXPECT_EQ(0, m_local_cluster.pool_create(m_local_pool_name.c_str()));
     EXPECT_EQ(0, m_local_cluster.ioctx_create(m_local_pool_name.c_str(),
                                              m_local_ioctx));
 
     EXPECT_EQ("", connect_cluster_pp(m_remote_cluster));
 
     m_remote_pool_name = get_temp_pool_name();
-    EXPECT_EQ("", create_one_pool_pp(m_remote_pool_name, m_remote_cluster));
+    EXPECT_EQ(0, m_remote_cluster.pool_create(m_remote_pool_name.c_str()));
     m_remote_pool_id = m_remote_cluster.pool_lookup(m_remote_pool_name.c_str());
     EXPECT_GE(m_remote_pool_id, 0);
 

diff --git a/src/test/rbd_mirror/test_PoolWatcher.cc b/src/test/rbd_mirror/test_PoolWatcher.cc
index b8ff3117b30db522cfb2df8a571e9cbf78e70f2c..5d131d37c2743966db620280849531d028007438 100644 (file)
--- a/src/test/rbd_mirror/test_PoolWatcher.cc
+++ b/src/test/rbd_mirror/test_PoolWatcher.cc
@@ -54,7 +54,8 @@ TestPoolWatcher() : m_lock("TestPoolWatcherLock"),
 
   void create_pool(bool enable_mirroring, const peer_t &peer, string *name=nullptr) {
     string pool_name = get_temp_pool_name("test-rbd-mirror-");
-    ASSERT_EQ("", create_one_pool_pp(pool_name, *m_cluster));
+    ASSERT_EQ(0, m_cluster->pool_create(pool_name.c_str()));
+
     int64_t pool_id = m_cluster->pool_lookup(pool_name.c_str());
     ASSERT_GE(pool_id, 0);
     m_pools.insert(pool_name);
@@ -83,7 +84,8 @@ TestPoolWatcher() : m_lock("TestPoolWatcherLock"),
   void create_cache_pool(const string &base_pool, string *cache_pool_name) {
     bufferlist inbl;
     *cache_pool_name = get_temp_pool_name("test-rbd-mirror-");
-    ASSERT_EQ("", create_one_pool_pp(*cache_pool_name, *m_cluster));
+    ASSERT_EQ(0, m_cluster->pool_create(cache_pool_name->c_str()));
+
     ASSERT_EQ(0, m_cluster->mon_command(
       "{\"prefix\": \"osd tier add\", \"pool\": \"" + base_pool +
       "\", \"tierpool\": \"" + *cache_pool_name +

diff --git a/src/test/rbd_mirror/test_fixture.cc b/src/test/rbd_mirror/test_fixture.cc
index 56620db0cd0009bd6439742f107104b66e9a87ea..34981eac95feb953550c2af71aaf9f73458590db 100644 (file)
--- a/src/test/rbd_mirror/test_fixture.cc
+++ b/src/test/rbd_mirror/test_fixture.cc
@@ -22,11 +22,13 @@ TestFixture::TestFixture() {
 }
 
 void TestFixture::SetUpTestCase() {
+  ASSERT_EQ("", connect_cluster_pp(_rados));
+
   _local_pool_name = get_temp_pool_name("test-rbd-mirror-");
-  ASSERT_EQ("", create_one_pool_pp(_local_pool_name, _rados));
+  ASSERT_EQ(0, _rados.pool_create(_local_pool_name.c_str()));
 
   _remote_pool_name = get_temp_pool_name("test-rbd-mirror-");
-  ASSERT_EQ("", create_one_pool_pp(_remote_pool_name, _rados));
+  ASSERT_EQ(0, _rados.pool_create(_remote_pool_name.c_str()));
 }
 
 void TestFixture::TearDownTestCase() {