]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: bound the portion of the log we request in PG::RecoveryState::GetLog::GetLog 12233/head
authorJie Wang <jie.wang@kylin-cloud.com>
Wed, 30 Nov 2016 03:21:01 +0000 (03:21 +0000)
committerJie Wang <jie.wang@kylin-cloud.com>
Wed, 30 Nov 2016 03:21:01 +0000 (03:21 +0000)
Signed-off-by: Jie Wang <jie.wang@kylin-cloud.com>
src/osd/PG.cc

index 6daf383cbc25adcd9d889f65de825434845ffd96..bc7bb552ff7171d43a23c89206b2b97f773a0d4a 100644 (file)
@@ -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;
   }