Skip to content
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 #5287

Merged
4 commits merged into from Oct 22, 2015

Conversation

Projects
None yet
4 participants
@smithfarm
Copy link
Contributor

commented Jul 19, 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)

Conflicts:
	src/test/osd/TestPGLog.cc
            leave out all the other tests that have been
            added to master since firefly
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)

@smithfarm smithfarm self-assigned this Jul 19, 2015

@smithfarm smithfarm added this to the firefly milestone Jul 19, 2015

TestPGLog: fix invalid proc_replica_log test case
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)

Conflicts:
    src/test/osd/TestPGLog.cc
       "sjustm: set_hash() method just does hash = and then rebuilds a cache,
        but the cache does not exist in firefly so hash = will do fine"

Signed-off-by: Nathan Cutler <ncutler@suse.com>

@smithfarm smithfarm force-pushed the SUSE:wip-12389-firefly branch from 70f26b1 to 8c02376 Jul 24, 2015

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

commented Sep 4, 2015

@athanatos This has passed a rados suite (see http://tracker.ceph.com/issues/11644#rados for details). OK to merge, do you think?

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

commented Sep 4, 2015

@dachary Seeing as Sam is out, could you take a look?

@ghost

This comment has been minimized.

Copy link

commented Sep 4, 2015

diff -u --ignore-matching-lines '^[^+-]' <(git show fdff8ce) <(git show b61e5ae) 

shows nothing, hence the tests that triggered the conflict were solely in the context and no test were accidentally removed.

@ghost

This comment has been minimized.

Copy link

commented Sep 4, 2015

@smithfarm this looks sensible. It is however a delicate part of the code and I would prefer @athanatos to confirm that backporting this as far back as firefly in this way is enough.

@smithfarm smithfarm changed the title PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out [DNM] PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out Sep 4, 2015

@smithfarm smithfarm changed the title [DNM] PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out PGLog::proc_replica_log: correctly handle case where entries between olog.head and log.tail were split out Sep 4, 2015

@smithfarm smithfarm assigned athanatos and unassigned smithfarm Sep 7, 2015

@athanatos

This comment has been minimized.

Copy link
Contributor

commented Sep 21, 2015

Good to go if it passed tests!

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

commented Sep 22, 2015

Thanks! We'll put it through another round of tests and merge if those go well.

@smithfarm smithfarm assigned smithfarm and unassigned athanatos Sep 22, 2015

ghost pushed a commit that referenced this pull request Oct 20, 2015

Merge pull request #5287: 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

This comment has been minimized.

Copy link

commented Oct 20, 2015

@liewegas does this backport look good to merge ? It passed a run of the firefly rados suite ( see http://tracker.ceph.com/issues/11644#note-110 ). Note that there was a valgrind issues but it is unrelated and fixed by #6325.

@liewegas

This comment has been minimized.

Copy link
Member

commented Oct 20, 2015

Looks ok to me, but I think this one should wait for @athanatos to return and comment.

ghost pushed a commit that referenced this pull request Oct 21, 2015

Merge pull request #5287: 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>
@athanatos

This comment has been minimized.

Copy link
Contributor

commented Oct 21, 2015

Looks good to me as well.

ghost pushed a commit that referenced this pull request Oct 22, 2015

Loic Dachary
Merge pull request #5287 from SUSE/wip-12389-firefly
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>
Reviewed-by: Samuel Just <sjust@redhat.com>

@ghost ghost merged commit e010899 into ceph:firefly Oct 22, 2015

@smithfarm smithfarm deleted the SUSE:wip-12389-firefly branch Oct 22, 2015

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

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.