From ccf21e7de76bf32ae98b8216919d84d3fdaf27fe Mon Sep 17 00:00:00 2001 From: Gil Bregman Date: Mon, 9 Sep 2024 16:52:39 +0300 Subject: [PATCH] Bump SPDK version to 24.05. Signed-off-by: Gil Bregman --- .env | 2 +- .gitmodules | 2 +- control/grpc.py | 6 +++--- spdk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env b/.env index ad08a6b0..1eb5d8f2 100644 --- a/.env +++ b/.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" diff --git a/.gitmodules b/.gitmodules index 59ba3381..d39e8591 100644 --- a/.gitmodules +++ b/.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 diff --git a/control/grpc.py b/control/grpc.py index c839bec8..8add6a96 100644 --- a/control/grpc.py +++ b/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: diff --git a/spdk b/spdk index cd16195a..0d9430fa 160000 --- a/spdk +++ b/spdk @@ -1 +1 @@ -Subproject commit cd16195a3dc914ea445e90b9cc8ba3211e17b267 +Subproject commit 0d9430fab9b368761b13dc73a65b0ed13d6c6bc6