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.

Sign up for GitHub

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

Jump to bottom

luminous: osd: Include dups in copy_after() and copy_up_to() #28185

Merged
merged 7 commits into from Jun 20, 2019
Merged

luminous: osd: Include dups in copy_after() and copy_up_to() #28185

merged 7 commits into from Jun 20, 2019

Commits on Mar 28, 2019

  1. osd: Remove unused pg_log_t::copy_range() 

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

Conflicts:
	src/osd/osd_types.cc (trivial)
    @dzafman
    dzafman committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    6a85955 View commit details
    Browse the repository at this point in the history

  2. osd: Fix off by 1 error in trim handling of osd_pg_log_dups_tracked 

    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)
    @dzafman
    dzafman committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    e1507ef View commit details
    Browse the repository at this point in the history

  3. osd: Include dups in copy_after() and copy_up_to() 

    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)
    @dzafman
    dzafman committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    d8af086 View commit details
    Browse the repository at this point in the history

  4. test: Adding standalone test of log copy handling 

    Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7959159)
    @dzafman
    dzafman committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    57b59c4 View commit details
    Browse the repository at this point in the history

  5. test: unittest_pglog: Remove irrelevant config values 

    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)
    @dzafman
    dzafman committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    38a1655 View commit details
    Browse the repository at this point in the history

  6. test: unittest_pglog: Additional test cases for trim, copy_up_to and … 

    …copy_after

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d0d244d)
    @dzafman
    dzafman committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    c860ecc View commit details
    Browse the repository at this point in the history

  7. osd: Fix merge_log_dups() not remove dup corresponding to log.tail 

    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 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    7b1dea4 View commit details
    Browse the repository at this point in the history