gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #69632 from gbregman/main

Browse Source 
mgr/cephadm: Add degraded namespace flag to NVMEoF spec file
This commit is contained in:
Gil Bregman 2026-06-23 16:24:36 +03:00 committed by GitHub
commit e317e86c8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ force_tls = {{ spec.force_tls }}
# This is a development flag, do not change it
max_message_length_in_mb = {{ spec.max_message_length_in_mb }}
io_stats_enabled = {{ spec.io_stats_enabled }}
degrade_namespace_on_kmip_error = {{ spec.degrade_namespace_on_kmip_error }}
[gateway-logs]
log_level = {{ spec.log_level }}

3
src/pybind/mgr/cephadm/tests/services/test_nvmeof.py
View File

@ -150,6 +150,7 @@ force_tls = False
# This is a development flag, do not change it
max_message_length_in_mb = 4
io_stats_enabled = True
degrade_namespace_on_kmip_error = True
[gateway-logs]
log_level = INFO
@ -400,6 +401,7 @@ force_tls = False
# This is a development flag, do not change it
max_message_length_in_mb = 4
io_stats_enabled = True
degrade_namespace_on_kmip_error = True
[gateway-logs]
log_level = INFO
@ -592,6 +594,7 @@ force_tls = False
# This is a development flag, do not change it
max_message_length_in_mb = 4
io_stats_enabled = True
degrade_namespace_on_kmip_error = True
[gateway-logs]
log_level = INFO

4
src/python-common/ceph/deployment/service_spec.py
View File

@ -1897,6 +1897,7 @@ class NvmeofServiceSpec(ServiceSpec):
force_tls: Optional[bool] = False,
max_message_length_in_mb: Optional[int] = 4,
io_stats_enabled: Optional[bool] = True,
degrade_namespace_on_kmip_error: Optional[bool] = True,
server_key: Optional[str] = None,
server_cert: Optional[str] = None,
client_key: Optional[str] = None,
@ -2056,6 +2057,8 @@ class NvmeofServiceSpec(ServiceSpec):
self.max_message_length_in_mb = max_message_length_in_mb
#: ``io_stats_enabled`` enables controller IO statistics
self.io_stats_enabled = io_stats_enabled
#: ``degrade_namespace_on_kmip_error`` on a KMIP key error in update, create a degraded ns
self.degrade_namespace_on_kmip_error = degrade_namespace_on_kmip_error
#: ``allowed_consecutive_spdk_ping_failures`` # of ping failures before aborting gateway
self.allowed_consecutive_spdk_ping_failures = allowed_consecutive_spdk_ping_failures
#: ``spdk_ping_interval_in_seconds`` sleep interval in seconds between SPDK pings
@ -2305,6 +2308,7 @@ class NvmeofServiceSpec(ServiceSpec):
verify_boolean(self.force_tls, "Force TLS")
verify_positive_int(self.max_message_length_in_mb, "Max protocol message length")
verify_boolean(self.io_stats_enabled, "Enable IO statistics")
verify_boolean(self.degrade_namespace_on_kmip_error, "Degrade namespace on KMIP error")
verify_non_negative_number(self.monitor_timeout, "Monitor timeout")
verify_non_negative_int(self.port, "Port")
verify_non_negative_int(self.discovery_port, "Discovery port")