Skip to content

Commit

Permalink
Merge pull request #860 from gbregman/devel
Browse files Browse the repository at this point in the history
Bump SPDK version to 24.05
gbregman authored Sep 10, 2024

Verified

This commit was signed with the committer’s verified signature.
weblate Weblate (bot)
2 parents 63ce22c + ccf21e7 commit 4ef6970
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions control/grpc.py
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion spdk
Submodule spdk updated 653 files

0 comments on commit 4ef6970

Please sign in to comment.