Skip to content

Commit ec64c3e

Browse files
committed
test/mon/test_config_map: free CrushWrapper created with new
before this change, we create a new CrushWrapper instance with `new`, but we never free this instance after done with it. and LeakSanitizer points this out: ``` Direct leak of 544 byte(s) in 1 object(s) allocated from: #0 0x561afe148fed in operator new(unsigned long) (/home/jenkins-build/build/workspace/ceph-pull-requests/build/bin/unittest_config_map+0x1c2fed) (BuildId: 3ce9eeed38cee335628fa74fdd08cd215b15019e) ceph#1 0x561afe151cbd in ConfigMap_result_sections_Test::TestBody() /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/mon/test_config_map.cc:93:16 ceph#2 0x561afe2689b6 in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:2605:10 ceph#3 0x561afe221262 in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:2641:14 ceph#4 0x561afe1d1f7c in testing::Test::Run() /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:2680:5 ceph#5 0x561afe1d3fb2 in testing::TestInfo::Run() /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:2858:11 ceph#6 0x561afe1d55eb in testing::TestSuite::Run() /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:3012:28 ceph#7 0x561afe1f2a78 in testing::internal::UnitTestImpl::RunAllTests() /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:5723:44 ceph#8 0x561afe2711e6 in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:2605:10 ceph#9 0x561afe227bd2 in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:2641:14 ceph#10 0x561afe1f1e02 in testing::UnitTest::Run() /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/src/gtest.cc:5306:10 ceph#11 0x561afe176ec0 in RUN_ALL_TESTS() /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2486:46 ceph#12 0x561afe176e51 in main /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googlemock/src/gmock_main.cc:70:10 ceph#13 0x7f37d9397d8f in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 ``` so in this change, we manage the `CrushWrapper` pointer with a smart pointer. because the size of `CrushWrapper` is relatively large, we don't create it on stack. Signed-off-by: Kefu Chai <[email protected]>
1 parent ffece5f commit ec64c3e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/test/mon/test_config_map.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "mon/ConfigMap.h"
55

66
#include <iostream>
7+
#include <memory>
78
#include <string>
89
#include "crush/CrushWrapper.h"
910
#include "common/ceph_context.h"
@@ -90,7 +91,7 @@ TEST(ConfigMap, result_sections)
9091
{
9192
ConfigMap cm;
9293
boost::intrusive_ptr<CephContext> cct{new CephContext(CEPH_ENTITY_TYPE_CLIENT), false};
93-
auto crush = new CrushWrapper;
94+
auto crush = std::make_unique<CrushWrapper>();
9495
crush->finalize();
9596

9697
int r;
@@ -124,19 +125,19 @@ TEST(ConfigMap, result_sections)
124125
EntityName n;
125126
n.set(CEPH_ENTITY_TYPE_MON, "a");
126127
auto c = cm.generate_entity_map(
127-
n, {}, crush, "none", nullptr);
128+
n, {}, crush.get(), "none", nullptr);
128129
ASSERT_EQ(1, c.size());
129130
ASSERT_EQ("a", c["foo"]);
130131

131132
n.set(CEPH_ENTITY_TYPE_MON, "b");
132133
c = cm.generate_entity_map(
133-
n, {}, crush, "none", nullptr);
134+
n, {}, crush.get(), "none", nullptr);
134135
ASSERT_EQ(1, c.size());
135136
ASSERT_EQ("m", c["foo"]);
136137

137138
n.set(CEPH_ENTITY_TYPE_MDS, "c");
138139
c = cm.generate_entity_map(
139-
n, {}, crush, "none", nullptr);
140+
n, {}, crush.get(), "none", nullptr);
140141
ASSERT_EQ(1, c.size());
141142
ASSERT_EQ("g", c["foo"]);
142143
}

0 commit comments

Comments
 (0)