From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Jan 2016 23:36:08 +0000 (-0500)
Subject: init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through
X-Git-Tag: v0.94.6~32^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a58873e213d7423d89c95db4e1710dc9631e3313;p=ceph.git

init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

..when set in the sysconfig/default file.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 03e01ae263ef207046933890821ae75d5e60d9b8)

[source default/sysconfig file too]
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index d558463ba0a1..f7acccaf3946 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -117,6 +117,9 @@ dofsumount=0
 verbose=0
 use_default_conf=1
 
+## set variables like cluster or conf
+[ -e /etc/sysconfig/ceph ] && . /etc/sysconfig/ceph
+[ -e /etc/default/ceph ] && . /etc/default/ceph
 
 while echo $1 | grep -q '^-'; do     # FIXME: why not '^-'?
 case $1 in
@@ -303,11 +306,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 -f'"
+		cmd="$SYSTEMD_RUN --unit=ceph-$name.$time -r bash -c '$files $tcmalloc $cmd --cluster $cluster -f'"
 	    else
-		cmd="$files $wrap $cmd --cluster $cluster $runmode"
+		cmd="$files $tcmalloc $wrap $cmd --cluster $cluster $runmode"
 	    fi
 
 	    if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then