]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: fix race condition
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 5 Jul 2017 08:48:14 +0000 (16:48 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Fri, 7 Jul 2017 00:43:16 +0000 (08:43 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc

index 74f35c2c8bb3e0ffb13549088c088705e79f8abf..f2faccadaa020ae6c3dc5e894f5e3171def7d48c 100644 (file)
@@ -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;
 }
 
 // =========================================================