From: Seena Fallah <seenafallah@gmail.com>
Date: Wed, 14 Oct 2020 13:00:57 +0000 (+0330)
Subject: ceph-osd: allow to use ceph_tcmalloc_max_total_thread_cache for bluestore
X-Git-Tag: v6.0.5~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ea3ec134d5ad8e0481e7593ba6605ebf2c675e96;p=ceph-ansible.git

ceph-osd: allow to use ceph_tcmalloc_max_total_thread_cache for bluestore

TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES is for both bluestore and filestore

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 41295f0ef661511953be607d44d82a80f5656d2e)
---

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 7f2bbb55f..648eee117 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -55,7 +55,6 @@
   include_tasks: configure_memory_allocator.yml
   when:
     - (ceph_tcmalloc_max_total_thread_cache | int) > 0
-    - osd_objectstore == 'filestore'
     - (ceph_origin == 'repository' or ceph_origin == 'distro')
 
 - name: include selinux.yml
diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index f7afa803a..8d06dce34 100644
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -54,7 +54,7 @@ numactl \
   {% endif -%}
   {{ container_env_args }} \
   -e CLUSTER={{ cluster }} \
-  {% if (ceph_tcmalloc_max_total_thread_cache | int) > 0 and osd_objectstore == 'filestore' -%}
+  {% if (ceph_tcmalloc_max_total_thread_cache | int) > 0 -%}
   -e TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES={{ ceph_tcmalloc_max_total_thread_cache }} \
   {% endif -%}
   -v /run/lvm/:/run/lvm/ \