From 03e01ae263ef207046933890821ae75d5e60d9b8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 20 Jan 2016 18:36:08 -0500 Subject: [PATCH] init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through ..when set in the sysconfig/default file. Signed-off-by: Sage Weil --- src/init-ceph.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/init-ceph.in b/src/init-ceph.in index 9d4fc71ea27..91857f16328 100755 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -338,11 +338,13 @@ for name in $what; do [ -n "$wrap" ] && runmode="-f &" && runarg="-f" [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;" + [ -n "$TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES" ] && tcmalloc="TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=$TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES" + if [ -n "$SYSTEMD_RUN" ]; then time=`date +%s.%N` - cmd="$SYSTEMD_RUN --unit=ceph-$name.$time -r bash -c '$files $cmd --cluster $cluster --setuser ceph --setgroup ceph -f'" + cmd="$SYSTEMD_RUN --unit=ceph-$name.$time -r bash -c '$files $tcmalloc $cmd --cluster $cluster --setuser ceph --setgroup ceph -f'" else - cmd="$files $wrap $cmd --cluster $cluster --setuser ceph --setgroup ceph $runmode" + cmd="$files $tcmalloc $wrap $cmd --cluster $cluster --setuser ceph --setgroup ceph $runmode" fi if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then