Merge pull request ceph#56461 from tchaikov/wip-test-test_config_map-fix-leaks

test/mon/test_config_map: fix leaks identified by LeakSanitizer

Reviewed-by: Casey Bodley <[email protected]>

Author: tchaikov

src/test/mon/test_config_map.cc

@@ -4,6 +4,7 @@
 #include "mon/ConfigMap.h"
 
 #include <iostream>
+#include <memory>
 #include <string>
 #include "crush/CrushWrapper.h"
 #include "common/ceph_context.h"
@@ -55,19 +56,19 @@ TEST(ConfigMap, parse_key)
 TEST(ConfigMap, add_option)
 {
   ConfigMap cm;
-  auto cct = new CephContext(CEPH_ENTITY_TYPE_MON);
+  boost::intrusive_ptr<CephContext> cct{new CephContext(CEPH_ENTITY_TYPE_CLIENT), false};
   int r;
 
   r = cm.add_option(
-    cct, "foo", "global", "fooval",
+    cct.get(), "foo", "global", "fooval",
     [&](const std::string& name) {
       return nullptr;
     });
   ASSERT_EQ(0, r);
   ASSERT_EQ(1, cm.global.options.size());
 
   r = cm.add_option(
-    cct, "foo", "mon", "fooval",
+    cct.get(), "foo", "mon", "fooval",
     [&](const std::string& name) {
       return nullptr;
     });
@@ -76,7 +77,7 @@ TEST(ConfigMap, add_option)
   ASSERT_EQ(1, cm.by_type["mon"].options.size());
 
   r = cm.add_option(
-    cct, "foo", "mon.a", "fooval",
+    cct.get(), "foo", "mon.a", "fooval",
     [&](const std::string& name) {
       return nullptr;
     });
@@ -89,22 +90,22 @@ TEST(ConfigMap, add_option)
 TEST(ConfigMap, result_sections)
 {
   ConfigMap cm;
-  auto cct = new CephContext(CEPH_ENTITY_TYPE_MON);
-  auto crush = new CrushWrapper;
+  boost::intrusive_ptr<CephContext> cct{new CephContext(CEPH_ENTITY_TYPE_CLIENT), false};
+  auto crush = std::make_unique<CrushWrapper>();
   crush->finalize();
 
   int r;
 
   r = cm.add_option(
-    cct, "foo", "global", "g",
+    cct.get(), "foo", "global", "g",
     [&](const std::string& name) {
       return nullptr;
     });
   ASSERT_EQ(0, r);
   ASSERT_EQ(1, cm.global.options.size());
 
   r = cm.add_option(
-    cct, "foo", "mon", "m",
+    cct.get(), "foo", "mon", "m",
     [&](const std::string& name) {
       return nullptr;
     });
@@ -113,7 +114,7 @@ TEST(ConfigMap, result_sections)
   ASSERT_EQ(1, cm.by_type["mon"].options.size());
 
   r = cm.add_option(
-    cct, "foo", "mon.a", "a",
+    cct.get(), "foo", "mon.a", "a",
     [&](const std::string& name) {
       return nullptr;
     });
@@ -124,19 +125,19 @@ TEST(ConfigMap, result_sections)
   EntityName n;
   n.set(CEPH_ENTITY_TYPE_MON, "a");
   auto c = cm.generate_entity_map(
-    n, {}, crush, "none", nullptr);
+    n, {}, crush.get(), "none", nullptr);
   ASSERT_EQ(1, c.size());
   ASSERT_EQ("a", c["foo"]);
 
   n.set(CEPH_ENTITY_TYPE_MON, "b");
   c = cm.generate_entity_map(
-    n, {}, crush, "none", nullptr);
+    n, {}, crush.get(), "none", nullptr);
   ASSERT_EQ(1, c.size());
   ASSERT_EQ("m", c["foo"]);
 
   n.set(CEPH_ENTITY_TYPE_MDS, "c");
   c = cm.generate_entity_map(
-    n, {}, crush, "none", nullptr);
+    n, {}, crush.get(), "none", nullptr);
   ASSERT_EQ(1, c.size());
   ASSERT_EQ("g", c["foo"]);
 }