From 1807a553f126e8cf7634bddcc7422c1ea47e1c80 Mon Sep 17 00:00:00 2001 From: Gil Bregman Date: Tue, 19 Nov 2024 13:51:37 +0200 Subject: [PATCH] mgr/cephadm: Add resource limits to nvmeof configuration Fixes https://tracker.ceph.com/issues/68967 Signed-off-by: Gil Bregman --- .../mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 | 4 ++++ src/pybind/mgr/cephadm/tests/test_services.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 index 760bc97e51539..2d69dccdc5463 100644 --- a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 +++ b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 @@ -22,6 +22,10 @@ ping_spdk_under_lock = {{ spec.ping_spdk_under_lock }} enable_monitor_client = {{ spec.enable_monitor_client }} max_hosts_per_namespace = {{ spec.max_hosts_per_namespace }} max_namespaces_with_netmask = {{ spec.max_namespaces_with_netmask }} +max_subsystems = {{ spec.max_subsystems }} +max_namespaces = {{ spec.max_namespaces }} +max_namespaces_per_subsystem = {{ spec.max_namespaces_per_subsystem }} +max_hosts_per_subsystem = {{ spec.max_hosts_per_subsystem }} [gateway-logs] log_level = {{ spec.log_level }} diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 824e37cf4d493..863bd1c22e5e4 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -411,6 +411,10 @@ ping_spdk_under_lock = False enable_monitor_client = True max_hosts_per_namespace = 1 max_namespaces_with_netmask = 1000 +max_subsystems = 128 +max_namespaces = 1024 +max_namespaces_per_subsystem = 256 +max_hosts_per_subsystem = 32 [gateway-logs] log_level = INFO -- 2.39.5