ceph-*-setup: use libc allocator for crimson flavor

to avoid the issues caused by allocator. we cannot use seastar allocator
in non-seastar thread or threads not managed by ThreadPool.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index e0066cdb41ddb0cf7459e9a6c4480fae2f079a6d..b87a8ad1bb2765da9ea781873d82ad85603cbcbb 100644 (file)
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -79,7 +79,7 @@ case "${FLAVOR}" in
     crimson)
         echo "Detected crimson flavor: will use flag: -DWITH_SEASTAR=ON"
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON -DSeastar_CXX_FLAGS=-DSEASTAR_DEFAULT_ALLOCATOR"
         ;;
     *)
         echo "unknown FLAVOR: ${FLAVOR}" >&2

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 5c41d114cf9bf76666d30a0e8599ad16430b7dd3..6832afe86aff675b8b37fd53a620e8b2a34a5f0d 100644 (file)
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -50,7 +50,7 @@ case "${FLAVOR}" in
         ;;
     crimson)
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON -DSeastar_CXX_FLAGS=-DSEASTAR_DEFAULT_ALLOCATOR"
         ;;
     *)
         echo "unknown FLAVOR: ${FLAVOR}" >&2