From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 14 Aug 2018 06:57:03 +0000 (+0800)
Subject: osd/PG: calc_min_last_complete_ondisk should return nothing
X-Git-Tag: v14.0.1~534^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12af0ed71b89806f3c6347b47fe3e5218b97bd4d;p=ceph.git

osd/PG: calc_min_last_complete_ondisk should return nothing

As we now no more use it to calc pg_trim_to.

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

diff --git a/src/osd/PG.h b/src/osd/PG.h
index bfc22e8d50dfc..bd2d196e68eff 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1354,7 +1354,7 @@ protected:
   bool all_unfound_are_queried_or_lost(const OSDMapRef osdmap) const;
   virtual void dump_recovery_info(Formatter *f) const = 0;
 
-  bool calc_min_last_complete_ondisk() {
+  void calc_min_last_complete_ondisk() {
     eversion_t min = last_complete_ondisk;
     assert(!acting_recovery_backfill.empty());
     for (set<pg_shard_t>::iterator i = acting_recovery_backfill.begin();
@@ -1362,15 +1362,15 @@ protected:
 	 ++i) {
       if (*i == get_primary()) continue;
       if (peer_last_complete_ondisk.count(*i) == 0)
-	return false;   // we don't have complete info
+	return;   // we don't have complete info
       eversion_t a = peer_last_complete_ondisk[*i];
       if (a < min)
 	min = a;
     }
     if (min == min_last_complete_ondisk)
-      return false;
+      return;
     min_last_complete_ondisk = min;
-    return true;
+    return;
   }
 
   virtual void calc_trim_to() = 0;