Skip to content

Commit 9a1d01d

Browse files
committed
mgr/cephadm/nvmeof: Add susbsystem cache expiration field to NVMeOF spec file
Fixes https://tracker.ceph.com/issues/72019 Signed-off-by: Gil Bregman <[email protected]>
1 parent 54197bf commit 9a1d01d

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ max_hosts = {{ spec.max_hosts }}
4141
max_namespaces = {{ spec.max_namespaces }}
4242
max_namespaces_per_subsystem = {{ spec.max_namespaces_per_subsystem }}
4343
max_hosts_per_subsystem = {{ spec.max_hosts_per_subsystem }}
44+
subsystem_cache_expiration = {{ spec.subsystem_cache_expiration }}
4445

4546
[gateway-logs]
4647
log_level = {{ spec.log_level }}

src/pybind/mgr/cephadm/tests/test_services.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ def test_nvmeof_config(self, _get_name, _run_cephadm, cephadm_module: CephadmOrc
390390
max_namespaces = 2048
391391
max_namespaces_per_subsystem = 256
392392
max_hosts_per_subsystem = 128
393+
subsystem_cache_expiration = 5
393394
394395
[gateway-logs]
395396
log_level = INFO

src/python-common/ceph/deployment/service_spec.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,7 @@ def __init__(self,
14101410
max_namespaces: Optional[int] = 2048,
14111411
max_namespaces_per_subsystem: Optional[int] = 256,
14121412
max_hosts_per_subsystem: Optional[int] = 128,
1413+
subsystem_cache_expiration: Optional[int] = 5,
14131414
server_key: Optional[str] = None,
14141415
server_cert: Optional[str] = None,
14151416
client_key: Optional[str] = None,
@@ -1537,6 +1538,8 @@ def __init__(self,
15371538
self.max_namespaces_per_subsystem = max_namespaces_per_subsystem
15381539
#: ``max_hosts_per_subsystem`` max number of hosts per subsystems
15391540
self.max_hosts_per_subsystem = max_hosts_per_subsystem
1541+
#: ``subsystem_cache_expiration`` number of seconds before subsystems cache expires
1542+
self.subsystem_cache_expiration = subsystem_cache_expiration
15401543
#: ``allowed_consecutive_spdk_ping_failures`` # of ping failures before aborting gateway
15411544
self.allowed_consecutive_spdk_ping_failures = allowed_consecutive_spdk_ping_failures
15421545
#: ``spdk_ping_interval_in_seconds`` sleep interval in seconds between SPDK pings
@@ -1739,6 +1742,8 @@ def validate(self) -> None:
17391742
verify_positive_int(self.max_namespaces, "Max namespaces")
17401743
verify_positive_int(self.max_namespaces_per_subsystem, "Max namespaces per subsystem")
17411744
verify_positive_int(self.max_hosts_per_subsystem, "Max hosts per subsystem")
1745+
verify_non_negative_number(self.subsystem_cache_expiration,
1746+
"Subsystem cache expiration period")
17421747
verify_non_negative_number(self.monitor_timeout, "Monitor timeout")
17431748
verify_non_negative_int(self.port, "Port")
17441749
verify_non_negative_int(self.discovery_port, "Discovery port")

0 commit comments

Comments
 (0)