run-make-check.sh: enable RBD persistent caches

This was attempted in commit 69a7ed4 ("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 <[email protected]>
mitsu-ko · Apr 19, 2022 · 0f1634a · 0f1634a
1 parent 59d928a
commit 0f1634a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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" "$@"