From: lixiaoy1 Date: Fri, 22 Jan 2021 16:07:40 +0000 (-0500) Subject: spec: enable RWL/SSD caches X-Git-Tag: v17.1.0~3168^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12ca24fc26ba1f7ef153ad1c1fc0d86497405b32;p=ceph.git spec: enable RWL/SSD caches Signed-off-by: Li, Xiaoyan --- diff --git a/ceph.spec.in b/ceph.spec.in index c11b1b76c27d..b0d999f6d283 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -62,6 +62,8 @@ %endif %bcond_with seastar %bcond_with jaeger +%bcond_with rbd_rwl_cache +%bcond_with rbd_ssd_cache %if 0%{?fedora} || 0%{?suse_version} >= 1500 # distros that ship cmd2 and/or colorama %bcond_without cephfs_shell @@ -1267,6 +1269,12 @@ ${CMAKE} .. \ %endif %if 0%{with cmake_verbose_logging} -DCMAKE_VERBOSE_MAKEFILE=ON \ +%endif +%if 0%{with rbd_rwl_cache} + -DWITH_RBD_RWL=ON \ +%endif +%if 0%{with rbd_ssd_cache} + -DWITH_RBD_SSD_CACHE=ON \ %endif -DBOOST_J=$CEPH_SMP_NCPUS \ -DWITH_GRAFANA=ON diff --git a/debian/rules b/debian/rules index f8e001549668..8acd5aa5f683 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,8 @@ extraopts += -DWITH_CEPHFS_JAVA=ON extraopts += -DWITH_CEPHFS_SHELL=ON extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default extraopts += -DWITH_GRAFANA=ON +extraopts += -DWITH_RBD_RWL=ON +extraopts += -DWITH_RBD_SSD_CACHE=ON # assumes that ceph is exmpt from multiarch support, so we override the libdir. extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/libexec