Merge pull request #860 from gbregman/devel

Bump SPDK version to 24.05

.env

@@ -1,7 +1,7 @@
 # Globals
 VERSION="1.3.1"
 CEPH_VERSION="18.2.4"
-SPDK_VERSION="24.01"
+SPDK_VERSION="24.05"
 CONTAINER_REGISTRY="quay.io/ceph"
 QUAY_SPDK="${CONTAINER_REGISTRY}/spdk"
 QUAY_CEPH="${CONTAINER_REGISTRY}/vstart-cluster"

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "spdk"]
 	path = spdk
 	url = https://github.com/ceph/spdk.git
-	branch = ceph-nvmeof-v24.01
+	branch = ceph-nvmeof-v24.05

control/grpc.py

@@ -372,7 +372,7 @@ def _alloc_cluster(self, anagrp: int) -> str:
         nonce = rpc_bdev.bdev_rbd_register_cluster(
             self.spdk_rpc_client,
             name = name,
-            user = self.rados_id,
+            user_id = self.rados_id,
             core_mask = self.librbd_core_mask,
         )
         with self.shared_state_lock:
@@ -2153,8 +2153,8 @@ def list_connections_safe(self, request, context):
                     try:
                         if qp["cntlid"] != conn["cntlid"]:
                             continue
-                        if qp["state"] != "active":
-                            self.logger.debug(f"Qpair {qp} is not active")
+                        if qp["state"] != "enabled":
+                            self.logger.debug(f"Qpair {qp} is not enabled")
                             continue
                         addr = qp["listen_address"]
                         if not addr: