]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: For needs_recovery, asap return if need recover. 4376/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Wed, 22 Apr 2015 01:17:39 +0000 (09:17 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Wed, 22 Apr 2015 01:17:39 +0000 (09:17 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/PG.cc

index 25f7c722e0e1d61063b3872dd3858cc3b0246632..8b7200a874bdc7a8f26abe13f01306fa6950b487 100644 (file)
@@ -572,15 +572,12 @@ bool PG::needs_recovery() const
 {
   assert(is_primary());
 
-  bool ret = false;
-
   const pg_missing_t &missing = pg_log.get_missing();
 
   if (missing.num_missing()) {
     dout(10) << __func__ << " primary has " << missing.num_missing()
       << " missing" << dendl;
-
-    ret = true;
+    return true;
   }
 
   assert(!actingbackfill.empty());
@@ -598,13 +595,12 @@ bool PG::needs_recovery() const
     if (pm->second.num_missing()) {
       dout(10) << __func__ << " osd." << peer << " has "
         << pm->second.num_missing() << " missing" << dendl;
-      ret = true;
+      return true;
     }
   }
 
-  if (!ret)
-    dout(10) << __func__ << " is recovered" << dendl;
-  return ret;
+  dout(10) << __func__ << " is recovered" << dendl;
+  return false;
 }
 
 bool PG::needs_backfill() const