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

Jump to bottom

Pacific: BlueStore: Omap upgrade to per-pg fix fix #43922

Merged
merged 2 commits into from Nov 19, 2021
Merged

Pacific: BlueStore: Omap upgrade to per-pg fix fix #43922

merged 2 commits into from Nov 19, 2021

Conversation

aclamk
Copy link
Contributor

@aclamk aclamk commented Nov 15, 2021 •
edited

Backport of #43921

During fix of https://tracker.ceph.com/issues/53062 small regression has been introduced.
Some keys got deleted during upgrade.

Fixes: https://tracker.ceph.com/issues/53307

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
  • Teuthology
    • Completed teuthology run
    • No teuthology test necessary (e.g., documentation)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@github-actions github-actions bot added this to the pacific milestone Nov 15, 2021
@neha-ojha neha-ojha changed the title Pacific: BlueStore: Omap upgrade to per-pg fix fix [Merge after https://github.com/ceph/ceph/pull/43921] Pacific: BlueStore: Omap upgrade to per-pg fix fix Nov 15, 2021
@aclamk aclamk force-pushed the wip-aclamk-fix-omap-upgrade-fix-pac branch from 7a45be1 to da8fb00 Compare November 17, 2021 21:54
@neha-ojha neha-ojha changed the title [Merge after https://github.com/ceph/ceph/pull/43921] Pacific: BlueStore: Omap upgrade to per-pg fix fix Pacific: BlueStore: Omap upgrade to per-pg fix fix Nov 17, 2021
@aclamk aclamk force-pushed the wip-aclamk-fix-omap-upgrade-fix-pac branch 2 times, most recently from 322380a to 1475178 Compare November 17, 2021 22:24
@aclamk @neha-ojha
os/bluestore: Add more legacy -> per PG upgrade tests
cd49a50 
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 0d13d64)

 Conflicts:
	src/test/objectstore/store_test.cc
@aclamk @neha-ojha
os/bluestore: Fix omap upgrade to per-pg scheme
e293295 
This is fix to regression introduced by fix to omap upgrade: ceph#43687
The problem was that we always skipped first omap entry.
This worked fine with objects having omap header key.
For objects without header key we skipped first actual omap key.

Fixes: https://tracker.ceph.com/issues/53307

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 65a3f37)
@neha-ojha neha-ojha force-pushed the wip-aclamk-fix-omap-upgrade-fix-pac branch from 1475178 to e293295 Compare November 19, 2021 19:36
@yuriw yuriw merged commit 130bcaa into ceph:pacific Nov 19, 2021
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ifed01 ifed01 ifed01 approved these changes

@jdurgin jdurgin Awaiting requested review from jdurgin

@neha-ojha neha-ojha Awaiting requested review from neha-ojha

Assignees
No one assigned
Labels
bluestore bug-fix core needs-qa tests wip-yuri11-testing
Projects
None yet
Milestone
pacific
4 participants
@aclamk @ifed01 @yuriw @neha-ojha