pacific: ceph-volume: fix activate #46511
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently 'prepare' doesn't support db/wal, but we want it in list and activate because 'ceph-volume activate ...' tries raw before lvm. Note that I'm not sure we really want to accept --block.db and --block.wal here at all. Fixes: 3d7ceec Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit f0a0c70)
Take a list of devices, so that we can selectively activate a raw osd with db/wal. Remove the argument type kludge introduced in 2c228a9 since it is no longer needed. Note that we're making this change because (1) it allows db/wal and (2) because there are no known users of 'raw activate'. The only known user is via 'ceph-volume activate' and we've fixed that caller in this commit. Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit afd8be7) Conflicts: src/ceph-volume/ceph_volume/devices/raw/list.py
Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit f10f944) Conflicts: src/pybind/mgr/cephadm/serve.py
afd8be7 broke it. It has dropped`block_wal` and `block_db` from `ceph_volume.devices.raw.activate.activate_bluestore` but `activate.main.Activate.main` still passes those arguments when calling `RAWActivate([]).activate()` Fixes: https://tracker.ceph.com/issues/54441 Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commit 3337b62)
guits
approved these changes
Jun 2, 2022
|
jenkins test ceph-volume tox |
|
jenkins test ceph-volume all |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #44030, #45216
These should have been included in #45964 but were missed out, introducing a regression in pacific
Conflicts in
src/pybind/mgr/cephadm/serve.py,src/ceph-volume/ceph_volume/devices/raw/list.pybut they were trivial whitespace stuffContribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "pacific"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windows