From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 13 Apr 2016 17:30:16 +0000 (-0400)
Subject: rgw: call rgw_log_usage_finalize() on reconfiguration
X-Git-Tag: v10.2.0~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8585%2Fhead;p=ceph.git

rgw: call rgw_log_usage_finalize() on reconfiguration

RGWRealmReloader was calling rgw_log_usage_init() with the new RGWRados
instance, but never cleaned up the previous one with
rgw_log_usage_finalize()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_realm_reloader.cc b/src/rgw/rgw_realm_reloader.cc
index a0c31fe728b8..8f38e987ea7d 100644
--- a/src/rgw/rgw_realm_reloader.cc
+++ b/src/rgw/rgw_realm_reloader.cc
@@ -80,6 +80,10 @@ void RGWRealmReloader::reload()
   frontends->pause();
 
   ldout(cct, 1) << "Frontends paused" << dendl;
+
+  // TODO: make RGWRados responsible for rgw_log_usage lifetime
+  rgw_log_usage_finalize();
+
   // destroy the existing store
   RGWStoreManager::close_storage(store);
   store = nullptr;