RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 07:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12720 from kylinstorage/wip-loop-invariant-code-motion

Browse Source 
osd/PG.cc: loop invariant code motion

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-04-26 13:04:12 -05:00 committed by GitHub
commit 415dcb438a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/PG.cc
View File

@ -7962,6 +7962,7 @@ PG::RecoveryState::GetMissing::GetMissing(my_context ctx)
PG *pg = context< RecoveryMachine >().pg;
assert(!pg->actingbackfill.empty());
eversion_t since;
for (set<pg_shard_t>::iterator i = pg->actingbackfill.begin();
i != pg->actingbackfill.end();
++i) {
@ -7995,7 +7996,7 @@ PG::RecoveryState::GetMissing::GetMissing(my_context ctx)
// We pull the log from the peer's last_epoch_started to ensure we
// get enough log to detect divergent updates.
eversion_t since(pi.last_epoch_started, 0);
since.epoch = pi.last_epoch_started;
assert(pi.last_update >= pg->info.log_tail); // or else choose_acting() did a bad thing
if (pi.log_tail <= since) {
ldout(pg->cct, 10) << " requesting log+missing since " << since << " from osd." << *i << dendl;