From: Kefu Chai <kchai@redhat.com>
Date: Fri, 4 Jun 2021 08:23:09 +0000 (+0800)
Subject: scripts/build_utils: always pass -DALLOCATOR
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a820c0ab2d9e980108a30f95bd5b82cf9e685667;p=ceph-build.git

scripts/build_utils: always pass -DALLOCATOR

this change reverts 901fe2e097548707350bc89c7650e0f72c45d994 and
17b40974b1cb10d1d8ba0373dbf578fb0e82f036.

since we don't need to buld master (quincy and up) on bionic anymore,
there is no need to worry about the FTBFS when compiling with a buggy
gperftools (<2.6.2) shipped along with bionic.

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

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 7d5dfe57..6e71b536 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -844,23 +844,7 @@ ceph_build_args_from_flavor() {
     case "${flavor}" in
     default)
         CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
-        # we have to build quincy and up on bionic, because some teuthology tests are
-        # still using ubuntu bionic:
-        # - the perftest depends on cosbench which is not compatible with ubuntu/focal, see
-        #   https://tracker.ceph.com/issues/49139
-        # - we need to test old clients which are built on bionic. for instance, we don't build
-        #   nautilus on focal yet.
-        # - some upgrade tests still include bionic facets.
-        #
-        # do not specify -DALLOCATOR=tcmalloc in CEPH_EXTRA_CMAKE_ARGS, and let
-        # cmake figure it out:
-        # - on quincy and up, gperftools 2.6.2 is required, so we are not
-        #   impacted by https://tracker.ceph.com/issues/39703. and cmake uses
-        #   tcmalloc if gperftools 2.6.2 and up is found. on bionic, cmake
-        #   falls back to libc allocator.
-        # - before quincy, since ALLOCATOR is not specified, cmake uses
-        #   tcmalloc as long as gperftools is found, and the fix of
-        #   https://tracker.ceph.com/issues/39703 is still not removed.
+        CEPH_EXTRA_CMAKE_ARGS+=" -DALLOCATOR=tcmalloc"
         ;;
     crimson)
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"