From 41b99b94e07b84c032a49f2bb328b3e4ae414605 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 5 Jul 2017 16:48:14 +0800 Subject: [PATCH] osd/OSD: fix race condition Signed-off-by: xie xingguo --- src/osd/OSD.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 74f35c2c8bb3..f2faccadaa02 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -9186,10 +9186,8 @@ void OSDService::finish_recovery_op(PG *pg, const hobject_t& soid, bool dequeue) bool OSDService::is_recovery_active() { - if (recovery_ops_active > 0) - return true; - - return false; + Mutex::Locker l(recovery_lock); + return recovery_ops_active > 0; } // ========================================================= -- 2.47.3