public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: Enable cephfs-shell and use system liburing 

(cherry picked from commit 196a7136a953eb3fa1b28a17b8d51126b0ee8372)
This commit is contained in:
Janne Heß 2021-06-30 18:55:32 +02:00 committed by github-actions[bot]
parent 917357a287
commit bae7213808
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/filesystems/ceph/default.nix
View File

@ -38,7 +38,7 @@
# Linux Only Dependencies # Linux Only Dependencies
, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c , linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null , libaio ? null, libxfs ? null, zfs ? null, liburing ? null
, ... , ...
}: }:
@ -114,6 +114,8 @@ let
ps.Mako ps.Mako
ceph-common ceph-common
ps.cherrypy ps.cherrypy
ps.cmd2
ps.colorama
ps.dateutil ps.dateutil
ps.jsonpatch ps.jsonpatch
ps.pecan ps.pecan
@ -163,7 +165,7 @@ in rec {
snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
cryptsetup sqlite lua icu bzip2 cryptsetup sqlite lua icu bzip2
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs
# ceph 14 # ceph 14
rdma-core rabbitmq-c rdma-core rabbitmq-c
] ++ lib.optionals hasRadosgw [ ] ++ lib.optionals hasRadosgw [
@ -194,11 +196,12 @@ in rec {
"-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}"
"-DWITH_SYSTEMD=OFF" "-DWITH_SYSTEMD=OFF"
"-DWITH_TESTS=OFF" "-DWITH_TESTS=OFF"
"-DWITH_CEPHFS_SHELL=ON"
# TODO breaks with sandbox, tries to download stuff with npm # TODO breaks with sandbox, tries to download stuff with npm
"-DWITH_MGR_DASHBOARD_FRONTEND=OFF" "-DWITH_MGR_DASHBOARD_FRONTEND=OFF"
# WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
]; ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON";
postFixup = '' postFixup = ''
wrapPythonPrograms wrapPythonPrograms