Skip to content

Commit

Permalink
osd/OSD: fix build_past_intervals_parallel
Browse files Browse the repository at this point in the history
We may be only calculating older past intervals and have a valid
history.same_interval_since value, in which case the local
same_interval_since value will end at the newest old interval we had to
generate.

Same as 0830275 change in generate_past_intervals()
This was introduced by 7031654.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 0fd674b)
  • Loading branch information
dzafman committed Apr 6, 2016
1 parent fce7902 commit ca0beef
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/osd/OSD.cc
Expand Up @@ -3080,10 +3080,7 @@ void OSD::build_past_intervals_parallel()
PG *pg = i->first;
pistate& p = i->second;

// Verify same_interval_since is correct
if (pg->info.history.same_interval_since) {
assert(pg->info.history.same_interval_since == p.same_interval_since);
} else {
if (pg->info.history.same_interval_since == 0) {
assert(p.same_interval_since);
dout(10) << __func__ << " fix same_interval_since " << p.same_interval_since << " pg " << *pg << dendl;
dout(10) << __func__ << " past_intervals " << pg->past_intervals << dendl;
Expand Down

0 comments on commit ca0beef

Please sign in to comment.