ceph: Bring back ceph-volume #78243
Merged
ceph: Bring back ceph-volume #78243
+9
−3
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
flokli
reviewed
Jan 22, 2020
| @@ -136,6 +137,7 @@ in rec { | |||
| # for pybind/rgw to find internal dep | |||
| export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" | |||
| # install target needs to be in PYTHONPATH for "*.pth support" check to succeed | |||
| export PYTHONPATH=${ceph-python-env}/lib/python${pyVersion}/site-packages:$lib/lib/python${pyVersion}/site-packages/:$out/lib/python${pyVersion}/site-packages/ | |||
There was a problem hiding this comment.
can we add a line here
# set PYTHONPATH, so the build system doesn't silently skip installing `ceph-volume`
?
There was a problem hiding this comment.
@srhb @flokli Why was this needed?
Isn't this what
pythonPath = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ];
does? (I haven't found yet where exactly the usage of pythonPath in mkDerivation is implemented)
I found it confusing that we currently set both, so it would be nice to understand why pythonPath isn't enough.
srhb
force-pushed
the
ceph-revert-lost-ceph-volume
branch
from
5279ff8 to
9be2935
Compare
srhb
force-pushed
the
ceph-revert-lost-ceph-volume
branch
from
9be2935 to
585ac58
Compare
|
@GrahamcOfBorg test ceph-single-node ceph-multi-node |
24 tasks
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.
Motivation for this change
In #73187 ceph-volume unfortunately got lost. I completely missed this in the backport as well, which means that OSDs using bluestore become inoperable. Therefore, this needs a backport asap.
Things done
Brought back the (admittedly hacky) pythonpath shenanigans that enable the build system to pick up the necessities and not silently skip installing ceph-volume and friends.
Deployed to a testing cluster and noted that ceph-volume correctly activates bluestore volumes. It seems the python wrapper is no longer necessary, the path is baked into the .py file.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)