From 36dc972e095e4be88a64b5ddbcf13649de0201c1 Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Wed, 14 Oct 2020 16:30:57 +0330 Subject: [PATCH] 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 (cherry picked from commit 41295f0ef661511953be607d44d82a80f5656d2e) --- roles/ceph-common/tasks/main.yml | 1 - roles/ceph-osd/templates/ceph-osd.service.j2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 7f2bbb55fe..648eee117d 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 f7afa803ae..8d06dce34d 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/ \