From: Kefu Chai Date: Sat, 4 Jul 2020 15:54:12 +0000 (+0800) Subject: ceph-*-setup: use libc allocator for crimson flavor X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1608%2Fhead;p=ceph-build.git 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 --- diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build index e0066cdb..b87a8ad1 100644 --- 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 5c41d114..6832afe8 100644 --- 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