From 0f1634a21f5da2250915d8ac05a6f179d4e76d03 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 19 Apr 2022 11:21:06 +0200 Subject: [PATCH] run-make-check.sh: enable RBD persistent caches This was attempted in commit 69a7ed4eab36 ("run-make-check: enable WITH_RBD_RWL when WITH_PMEM is true") but never completed. We soon bumped the requirement on libpmem, so WITH_SYSTEM_PMDK=ON wouldn't have worked anyway. Enable the RWL mode conditionally based on WITH_RBD_RWL variable. Enable the SSD mode unconditionally as it has no special dependencies and can be built on any architecture. Fixes: https://tracker.ceph.com/issues/55285 Signed-off-by: Ilya Dryomov --- run-make-check.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index 00adba78c228f..a67145a4d2894 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -97,9 +97,10 @@ function main() { if [ $WITH_ZBD ]; then cmake_opts+=" -DWITH_ZBD=ON" fi - if [ $WITH_PMEM ]; then - cmake_opts+=" -DWITH_RBD_RWL=ON -DWITH_SYSTEM_PMDK=ON" + if [ $WITH_RBD_RWL ]; then + cmake_opts+=" -DWITH_RBD_RWL=ON" fi + cmake_opts+=" -DWITH_RBD_SSD_CACHE=ON" in_jenkins && echo "CI_DEBUG: Our cmake_opts are: $cmake_opts CI_DEBUG: Running ./configure" configure "$cmake_opts" "$@"