From: Jie Wang <jie.wang@kylin-cloud.com>
Date: Wed, 30 Nov 2016 03:21:01 +0000 (+0000)
Subject: osd/PG: bound the portion of the log we request in PG::RecoveryState::GetLog::GetLog
X-Git-Tag: v12.0.0~191^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=823551aee76d494fc8b2074827750a42a003afa4;p=ceph.git

osd/PG: bound the portion of the log we request in PG::RecoveryState::GetLog::GetLog

Signed-off-by: Jie Wang <jie.wang@kylin-cloud.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 6daf383cbc25..bc7bb552ff71 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -7474,7 +7474,8 @@ PG::RecoveryState::GetLog::GetLog(my_context ctx)
        ++p) {
     if (*p == pg->pg_whoami) continue;
     pg_info_t& ri = pg->peer_info[*p];
-    if (ri.last_update >= best.log_tail && ri.last_update < request_log_from)
+    if (ri.last_update < pg->info.log_tail && ri.last_update >= best.log_tail &&
+        ri.last_update < request_log_from)
       request_log_from = ri.last_update;
   }