New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd: PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out #5380

Merged
4 commits merged into from Aug 30, 2015

Conversation

Projects
None yet
3 participants
@ghost

ghost commented Jul 28, 2015

athanatos added some commits Apr 9, 2015

PGLog::proc_replica_log: handle split out overlapping entries
See the comment, if the overlapping entries between olog.head
and log.tail were split out, last_update should be log.tail.

Fixes: 11358
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 6561e0d)
TestPGLog: add test for 11358
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit b61e5ae)
TestPGLog: fix noop log proc_replica_log test case
Need to fill in log.head, olog.head.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1e5b220)
TestPGLog: fix invalid proc_replica_log test caes
If 1'3 is non-divergent, no osd could correctly have created 2'3.  Also,
proc_replica_log does not add the extra entries from the auth log to the
missing set, that happens later on in activate.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1333b67)

@ghost ghost self-assigned this Jul 28, 2015

@ghost ghost added this to the hammer milestone Jul 28, 2015

@ghost ghost added bug fix core labels Jul 28, 2015

ghost pushed a commit that referenced this pull request Jul 29, 2015

Merge pull request #5380: PGLog::proc_replica_log: correctly handle c…
…ase where entries between olog.head and log.tail were split out

Reviewed-by:
@ghost

This comment has been minimized.

ghost commented Aug 30, 2015

@liewegas does this backport look good to merge ? It passed a run of the hammer rados suite ( see http://tracker.ceph.com/issues/12701#rados for details ).

@liewegas

This comment has been minimized.

Member

liewegas commented Aug 30, 2015

👍

ghost pushed a commit that referenced this pull request Aug 30, 2015

Merge pull request #5380: PGLog::proc_replica_log: correctly handle c…
…ase where entries between olog.head and log.tail were split out

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Aug 30, 2015

Loic Dachary
Merge pull request #5380 from dachary/wip-12390-hammer
PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out

Reviewed-by: Sage Weil <sage@redhat.com>

@ghost ghost merged commit 7357659 into ceph:hammer Aug 30, 2015

@ghost ghost changed the title from PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out to osd: PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out Sep 13, 2015

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment