rgw: free resolver on shutdown

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 07c0aebfa0a07ef1df77cbae6bd0fa7b08f347fa..ec62d670cea74aa656b5af05a7f823d3525d456a 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -597,6 +597,7 @@ int main(int argc, const char **argv)
   RGWStoreManager::close_storage(store);
 
   rgw_tools_cleanup();
+  rgw_shutdown_resolver();
   curl_global_cleanup();
 
   dout(1) << "final shutdown" << dendl;

diff --git a/src/rgw/rgw_resolve.cc b/src/rgw/rgw_resolve.cc
index adbff3f4318ec4fb9f469b99a8b969cdf2aef2ce..9a8b14b2e0185911233c70e949b41658c6ae7de8 100644 (file)
--- a/src/rgw/rgw_resolve.cc
+++ b/src/rgw/rgw_resolve.cc
@@ -170,3 +170,8 @@ void rgw_init_resolver()
 {
   rgw_resolver = new RGWResolver();
 }
+
+void rgw_shutdown_resolver()
+{
+  delete rgw_resolver;
+}

diff --git a/src/rgw/rgw_resolve.h b/src/rgw/rgw_resolve.h
index 164a31a0215f58c825d188c3c2cd197c9745bfee..3b29ba580fe4ca5f4f2a2bb99d6affdfc919ff65 100644 (file)
--- a/src/rgw/rgw_resolve.h
+++ b/src/rgw/rgw_resolve.h
@@ -8,14 +8,15 @@ class RGWDNSResolver;
 class RGWResolver {
   RGWDNSResolver *resolver;
 
-  ~RGWResolver();
 public:
+  ~RGWResolver();
   RGWResolver();
   int resolve_cname(const string& hostname, string& cname, bool *found);
 };
 
 
 extern void rgw_init_resolver(void);
+extern void rgw_shutdown_resolver(void);
 extern RGWResolver *rgw_resolver;
 
 #endif