rgw: shut down timer before erroring out

Fixes: ceph#11145 Backport: hammer Clean up initialization timer, otherwise if we error out, we'll assert. Signed-off-by: Yehuda Sadeh <[email protected]>
WuAlan · Mar 23, 2015 · 924ace8 · 924ace8
1 parent 3216a58
commit 924ace8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
@@ -1066,6 +1066,11 @@ int main(int argc, const char **argv)
   int r = 0;
   RGWRados *store = RGWStoreManager::get_storage(g_ceph_context, true, true);
   if (!store) {
+    mutex.Lock();
+    init_timer.cancel_all_events();
+    init_timer.shutdown();
+    mutex.Unlock();
+
     derr << "Couldn't init storage provider (RADOS)" << dendl;
     return EIO;
   }