From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 5 Jul 2017 08:48:14 +0000 (+0800)
Subject: osd/OSD: fix race condition
X-Git-Tag: v12.1.1~101^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41b99b94e07b84c032a49f2bb328b3e4ae414605;p=ceph.git

osd/OSD: fix race condition

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

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;
 }
 
 // =========================================================