From f8504700c8ac873459bc4736041f2477393fb474 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Wed, 22 Apr 2015 09:17:39 +0800 Subject: [PATCH] PG: For needs_recovery, asap return if need recover. Signed-off-by: Jianpeng Ma --- src/osd/PG.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 25f7c722e0e1d..8b7200a874bdc 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -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 -- 2.39.5