Merge pull request #4194 from athanatos/wip-11199

ReplicatedPG: trim backfill intervals based on peer's last_backfill_star...

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-03-27 08:15:29 -07:00
commit 59143d141c

View File

@ -9556,7 +9556,8 @@ int ReplicatedPG::recover_backfill(
for (set<pg_shard_t>::iterator i = backfill_targets.begin();
i != backfill_targets.end();
++i) {
peer_backfill_info[*i].trim_to(last_backfill_started);
peer_backfill_info[*i].trim_to(
MAX(peer_info[*i].last_backfill, last_backfill_started));
}
backfill_info.trim_to(last_backfill_started);