Merge pull request ceph#56885 from Svelar/asan_OSDScrub

Svelar · web-flow · commit a7639cb6ce63 · 2024-04-16T14:02:39.000+08:00
test/osd/TestOSDScrub: free res_ninit/res_nquery  and MonClient resource
diff --git a/src/common/dns_resolve.cc b/src/common/dns_resolve.cc
@@ -56,6 +56,7 @@ DNSResolver::~DNSResolver()
 #ifdef HAVE_RES_NQUERY
   for (auto iter = states.begin(); iter != states.end(); ++iter) {
     struct __res_state *s = *iter;
+    res_nclose(s);
     delete s;
   }
 #endif
diff --git a/src/test/osd/TestOSDScrub.cc b/src/test/osd/TestOSDScrub.cc
@@ -196,6 +196,7 @@ TEST(TestOSDScrub, scrub_time_permit) {
   now = utime_t(mktime(&tm), 0);
   ret = osd->scrub_time_permit(now);
   ASSERT_FALSE(ret);
+  mc.shutdown();
 }
 
 // Local Variables:

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ DNSResolver::~DNSResolver()`
`56`	`56`	`#ifdef HAVE_RES_NQUERY`
`57`	`57`	`for (auto iter = states.begin(); iter != states.end(); ++iter) {`
`58`	`58`	`struct __res_state s = iter;`
	`59`	`+ res_nclose(s);`
`59`	`60`	`delete s;`
`60`	`61`	`}`
`61`	`62`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ TEST(TestOSDScrub, scrub_time_permit) {`
`196`	`196`	`now = utime_t(mktime(&tm), 0);`
`197`	`197`	`ret = osd->scrub_time_permit(now);`
`198`	`198`	`ASSERT_FALSE(ret);`
	`199`	`+ mc.shutdown();`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`// Local Variables:`