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

mimic: osd: Include dups in copy_after() and copy_up_to() #28089

Merged
merged 7 commits into from Jul 17, 2019

Conversation

@dzafman
Copy link
Member

dzafman commented May 14, 2019

dzafman added 7 commits Apr 30, 2019
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d1ad129)

Conflicts:
	src/osd/osd_types.cc (trivial)
Move log message out of loop so it doesn't repeat for no reason

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b698e34)
Client saw out of order results in a test with a very small
pg_log because a backfill/recovery sent a small number of
log entries for duplicate checks.

Since these copy operations are equivalent to both a copy
and trim (an argument controls how many log entries
transfer), we need to include any new dups with enough
existing dups up to the configured maximum.

Fixes: http://tracker.ceph.com/issues/39304

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 00f279d)

Conflicts:
	src/osd/PeeringState.cc contents in src/osd/PG.cc
	src/osd/osd_types.cc (trivial)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7959159)
osd_min_pg_log_entries and osd_max_pg_log_entries are not involved
in the log handling code being tested.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a008bd8)

Conflicts:
	src/test/osd/TestPGLog.cc (trivial)
…copy_after

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d0d244d)
The log tail is not inclusive of the log, so not an overlap
Fix unittest_pglog to verify proper operation

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f526c6d)
@dzafman dzafman added this to the mimic milestone May 14, 2019
@smithfarm smithfarm added the core label May 14, 2019
@dzafman dzafman requested a review from neha-ojha Jun 3, 2019
@dzafman

This comment has been minimized.

Copy link
Member Author

dzafman commented Jun 3, 2019

jerkins retest this please

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 8, 2019

@yuriw yuriw merged commit 69c7748 into ceph:mimic Jul 17, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.