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: kill sortbitwise #13321

Merged
merged 13 commits into from Feb 13, 2017

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Feb 8, 2017

This rips out all of the bitwise vs nibblewise nastyness in the code. The only remaining bits are in the interval checks (which need to be correct for past osdmap intervals and any period where sortbitwise gets unset), and in the last_backfill_bitwise field in pg_info_t, which might still be populated by old osds that haven't gone clean since before the bitwise flag was set.

The big win here is we're back to operator< and friends for hobject_t and ghobject_t, yay!

liewegas added some commits Feb 8, 2017

osd: shutdown if sortbitwise flag is ever cleared
Note we do this only in activate_map so that we can (while booting)
skip past maps that don't have it set.

Signed-off-by: Sage Weil <sage@redhat.com>
os: remove nibblewise sort order support
Signed-off-by: Sage Weil <sage@redhat.com>
osd/osd_types: drop bitwise from ScrubMap
Signed-off-by: Sage Weil <sage@redhat.com>
osd: fix write_blocked_by_scrub
Signed-off-by: Sage Weil <sage@redhat.com>
osd: fix add_source_info
Signed-off-by: Sage Weil <sage@redhat.com>
osd: BackfillInterval is always bitwise
Signed-off-by: Sage Weil <sage@redhat.com>
osd/osd_types: make set_last_backfill() assume bitwise
Signed-off-by: Sage Weil <sage@redhat.com>
osd/PG: drop bitwise arg to MissingLoc::rebuild()
Signed-off-by: Sage Weil <sage@redhat.com>
osd/PG: always bitwise
Signed-off-by: Sage Weil <sage@redhat.com>
common/hobject: remove cmp_* comparators; add normal operators
Fix up callers.

Signed-off-by: Sage Weil <sage@redhat.com>
common/hobject: eliminate wonky compartors
Signed-off-by: Sage Weil <sage@redhat.com>
osd/PG: drop get_sort_bitwise() accessors, flag
Signed-off-by: Sage Weil <sage@redhat.com>
osd/PrimaryLogPG: unconditionally set PGNLS next to hobject
Drop nibblewise workaround.

Signed-off-by: Sage Weil <sage@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Feb 13, 2017

@badone this got a clean rados run. mind reviewing?

@badone

badone approved these changes Feb 13, 2017

Big change, but looks good as far as I can see.

@liewegas liewegas merged commit 316dc98 into ceph:master Feb 13, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@liewegas liewegas deleted the liewegas:wip-kill-sortbitwise-harder branch Feb 13, 2017

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