python-common/ceph/deployment: revert SPDK RPC fields in nvmeof configuration

Fixes https://tracker.ceph.com/issues/67844

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 0ece1c25a8386f01d783723bc3bffa2da3a05da9..0efd10545c6be4d319767f02ba5d0dc2010522f9 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -1330,6 +1330,7 @@ class NvmeofServiceSpec(ServiceSpec):
                  verify_nqns: Optional[bool] = True,
                  allowed_consecutive_spdk_ping_failures: Optional[int] = 1,
                  spdk_ping_interval_in_seconds: Optional[float] = 2.0,
+                 ping_spdk_under_lock: Optional[bool] = False,
                  server_key: Optional[str] = None,
                  server_cert: Optional[str] = None,
                  client_key: Optional[str] = None,
@@ -1338,9 +1339,9 @@ class NvmeofServiceSpec(ServiceSpec):
                  spdk_path: Optional[str] = None,
                  tgt_path: Optional[str] = None,
                  spdk_timeout: Optional[float] = 60.0,
-                 spdk_log_level: Optional[str] = '',
-                 spdk_protocol_log_level: Optional[str] = 'WARNING',
-                 rpc_socket: Optional[str] = '/var/tmp/spdk.sock',
+                 spdk_log_level: Optional[str] = 'WARNING',
+                 rpc_socket_dir: Optional[str] = '/var/tmp/',
+                 rpc_socket_name: Optional[str] = 'spdk.sock',
                  conn_retries: Optional[int] = 10,
                  transports: Optional[str] = 'tcp',
                  transport_tcp_options: Optional[Dict[str, int]] =
@@ -1407,6 +1408,8 @@ class NvmeofServiceSpec(ServiceSpec):
         self.allowed_consecutive_spdk_ping_failures = allowed_consecutive_spdk_ping_failures
         #: ``spdk_ping_interval_in_seconds`` sleep interval in seconds between SPDK pings
         self.spdk_ping_interval_in_seconds = spdk_ping_interval_in_seconds
+        #: ``ping_spdk_under_lock`` whether or not we should perform SPDK ping under the RPC lock
+        self.ping_spdk_under_lock = ping_spdk_under_lock
         #: ``bdevs_per_cluster`` number of bdevs per cluster
         self.bdevs_per_cluster = bdevs_per_cluster
         #: ``server_key`` gateway server key
@@ -1426,11 +1429,11 @@ class NvmeofServiceSpec(ServiceSpec):
         #: ``spdk_timeout`` SPDK connectivity timeout
         self.spdk_timeout = spdk_timeout
         #: ``spdk_log_level`` the SPDK log level
-        self.spdk_log_level = spdk_log_level
-        #: ``spdk_protocol_log_level`` the SPDK-GW protocol log level
-        self.spdk_protocol_log_level = spdk_protocol_log_level or 'WARNING'
-        #: ``rpc_socket`` the SPDK RPC socket file path
-        self.rpc_socket = rpc_socket or '/var/tmp/spdk.sock'
+        self.spdk_log_level = spdk_log_level or 'WARNING'
+        #: ``rpc_socket_dir`` the SPDK RPC socket file directory
+        self.rpc_socket_dir = rpc_socket_dir or '/var/tmp/'
+        #: ``rpc_socket_name`` the SPDK RPC socket file name
+        self.rpc_socket_name = rpc_socket_name or 'spdk.sock'
         #: ``conn_retries`` ceph connection retries number
         self.conn_retries = conn_retries
         #: ``transports`` tcp
@@ -1508,16 +1511,6 @@ class NvmeofServiceSpec(ServiceSpec):
                     'Invalid SPDK log level. Valid values are: '
                     'DEBUG, INFO, WARNING, ERROR, NOTICE')
 
-        if self.spdk_protocol_log_level:
-            if self.spdk_protocol_log_level.lower() not in ['debug',
-                                                            'info',
-                                                            'warning',
-                                                            'error',
-                                                            'notice']:
-                raise SpecValidationError(
-                    'Invalid SPDK protocol log level. Valid values are: '
-                    'DEBUG, INFO, WARNING, ERROR, NOTICE')
-
         if (
             self.spdk_ping_interval_in_seconds
             and self.spdk_ping_interval_in_seconds < 1.0