From 2a22b2b7b33fde19a80d4f6713904d17e8d855a5 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 3 Nov 2015 10:44:17 -0500 Subject: [PATCH] rgw: realm watcher locks mutex for SafeTimer::shutdown() this fixes an assert() on shutdown Signed-off-by: Casey Bodley --- src/rgw/rgw_realm_watcher.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rgw/rgw_realm_watcher.cc b/src/rgw/rgw_realm_watcher.cc index 54433500f2b7f..607fb8551e363 100644 --- a/src/rgw/rgw_realm_watcher.cc +++ b/src/rgw/rgw_realm_watcher.cc @@ -54,6 +54,8 @@ RGWRealmWatcher::RGWRealmWatcher(CephContext *cct, RGWRados *&store, RGWRealmWatcher::~RGWRealmWatcher() { watch_stop(); + + Mutex::Locker lock(mutex); timer.shutdown(); } -- 2.39.5