From e7963b5765d3120ab65cb0b93ffceac47a1a3ff5 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 25 Apr 2022 13:28:02 -0400 Subject: [PATCH] rgw: OpsLogFile::stop() signals under mutex this shuts up ceph::debug_condition_variable's assertion that the associated mutex is held during notify_one(). this is not strictly required for correct use, but is a common source of bugs Fixes: https://tracker.ceph.com/issues/55432 Signed-off-by: Casey Bodley (cherry picked from commit cf6f99e67a6dbbc4e39d9e1fda32356c18051f5a) --- src/rgw/rgw_log.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc index bd2c360655cf0..a140c42a0944c 100644 --- a/src/rgw/rgw_log.cc +++ b/src/rgw/rgw_log.cc @@ -401,6 +401,7 @@ void OpsLogFile::start() { void OpsLogFile::stop() { { + std::unique_lock lock(log_mutex); cond_flush.notify_one(); stopped = true; } -- 2.39.5