mgr/cephadm: Change the default value of omap_file_lock_duration in NVMEoF spec file

Fixes: https://tracker.ceph.com/issues/74822
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index 5290328f2ebd0e309caf426964130ca209e2d5ea..055fad07f852c6636eb8a3b9fc88684fe23a7b84 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -482,7 +482,7 @@ abort_on_update_error = True
 omap_file_ignore_unlock_errors = False
 # This is a development flag, do not change it
 omap_file_lock_on_read = True
-omap_file_lock_duration = 20
+omap_file_lock_duration = 40
 omap_file_lock_retries = 30
 omap_file_lock_retry_sleep_interval = 1.0
 omap_file_update_reloads = 10

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-gateway-group/nvmeof-gateway-group.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-gateway-group/nvmeof-gateway-group.component.spec.ts
index 6d25ac626aaaf2f056313d818a15c0269ce8de6f..9ea34f16bd57e8009154334e83b9def4af75fd6b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-gateway-group/nvmeof-gateway-group.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-gateway-group/nvmeof-gateway-group.component.spec.ts
@@ -75,7 +75,7 @@ describe('NvmeofGatewayGroupComponent', () => {
           max_subsystems: 128,
           monitor_timeout: 1,
           notifications_interval: 60,
-          omap_file_lock_duration: 20,
+          omap_file_lock_duration: 40,
           omap_file_lock_on_read: true,
           omap_file_lock_retries: 30,
           omap_file_lock_retry_sleep_interval: 1,
@@ -172,7 +172,7 @@ describe('NvmeofGatewayGroupComponent', () => {
           max_subsystems: 128,
           monitor_timeout: 1,
           notifications_interval: 60,
-          omap_file_lock_duration: 20,
+          omap_file_lock_duration: 40,
           omap_file_lock_on_read: true,
           omap_file_lock_retries: 30,
           omap_file_lock_retry_sleep_interval: 1,

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index d1b7a678f86b276e3932d43cfa0e066f42ea799a..eaddc2c1949a4f9408e17413592068b9d05bdb26 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -1666,7 +1666,7 @@ class NvmeofServiceSpec(ServiceSpec):
                  abort_on_update_error: Optional[bool] = True,
                  omap_file_ignore_unlock_errors: Optional[bool] = False,
                  omap_file_lock_on_read: Optional[bool] = True,
-                 omap_file_lock_duration: Optional[int] = 20,
+                 omap_file_lock_duration: Optional[int] = 40,
                  omap_file_lock_retries: Optional[int] = 30,
                  omap_file_lock_retry_sleep_interval: Optional[float] = 1.0,
                  omap_file_update_reloads: Optional[int] = 10,