]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph.spec.in, debian/rules: Set rbd-rwl-cache optional on arm64 and ppc64le
authorKevin Zhao <kevin.zhao@linaro.org>
Thu, 24 Jun 2021 00:00:03 +0000 (08:00 +0800)
committerKevin Zhao <kevin.zhao@linaro.org>
Fri, 25 Jun 2021 03:53:18 +0000 (11:53 +0800)
set rwl cache option on arm64 and ppc64le as PMDK is not well supported.
Currently, only 64-bit Linux* and Windows* on x86 are supported PMDK

Reference:
1. Experimental support on Arm64, but lacking of librpmem:
See: https://github.com/pmem/pmdk#experimental-support-for-64-bit-arm
2. No RPM for PMDK on Arm64:
See: https://bugzilla.redhat.com/show_bug.cgi?id=1340635
3. > Does PMDK support ARM64*?
   > Currently only 64-bit Linux* and Windows* on x86 are supported.
See: https://software.intel.com/content/www/us/en/develop/articles/persistent-memory-faq.html
4. Make check fail on Arm64
See: https://github.com/pmem/pmdk/issues/5255

Fixes: https://tracker.ceph.com/issues/51339
Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
ceph.spec.in
debian/rules

index c34fdb5fcf79f0719c39d24ea3301c4b3da30336..3770b4386291f34d70b4f289b3fc73becd884964 100644 (file)
 %endif
 %bcond_with system_pmdk
 %bcond_without rbd_ssd_cache
-%if 0%{?fedora} || 0%{?rhel}
-%bcond_without selinux
-%ifarch x86_64 ppc64le
+%ifarch x86_64
 %bcond_without rbd_rwl_cache
 %else
 %bcond_with rbd_rwl_cache
 %endif
+%if 0%{?fedora} || 0%{?rhel}
+%bcond_without selinux
 %if 0%{?rhel} >= 8
 %bcond_with cephfs_java
 %else
 %bcond_with libradosstriper
 %ifarch x86_64 aarch64 ppc64le
 %bcond_without lttng
-%bcond_without rbd_rwl_cache
 %else
 %bcond_with lttng
-%bcond_with rbd_rwl_cache
 %endif
 %bcond_with ocf
 %bcond_with selinux
index f808099fb5c7b6d156ec93f5d0921e8c1ab60048..8cb3949fb566df2eb2400fec1e45db35a4a3ee39 100755 (executable)
@@ -24,7 +24,11 @@ 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
+ifeq ($(DEB_HOST_ARCH), amd64)
+  extraopts += -DWITH_RBD_RWL=ON
+else
+  extraopts += -DWITH_RBD_RWL=OFF
+endif
 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