Skip to content

feat(instance): forward v2 data-engine transport to SPDK create calls #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
abonillabeeche wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

feat(instance): forward v2 data-engine transport to SPDK create calls #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c994476
feat(instance): forward v2 data-engine transport to SPDK create calls
abonillabeeche Aug 20, 2026
699372c
refactor(instance): adopt TransportType naming from longhorn/types#121
abonillabeeche Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ RUN zypper -n install sg3_utils iproute2
RUN zypper -n install util-linux-systemd nfs-client nfs4-acl-tools
RUN zypper clean -a

# Install SPDK dependencies
# Install SPDK dependencies (--rdma pulls libibverbs/librdmacm runtime libs for the NVMe-oF RDMA transport)
COPY --from=cbuilder /usr/src/spdk/scripts /usr/src/spdk/scripts
COPY --from=cbuilder /usr/src/spdk/include /usr/src/spdk/include
RUN for i in {1..10}; do \
bash /usr/src/spdk/scripts/pkgdep.sh && break || sleep 1; \
bash /usr/src/spdk/scripts/pkgdep.sh --rdma && break || sleep 1; \
done

# Copy pre-built binaries from cbuilder and gobuilder
Expand Down
31 changes: 19 additions & 12 deletions pkg/client/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ type InstanceCreateRequest struct {
ShardGroup ShardGroupCreateRequest
DataLayoutType rpc.DataLayoutType

// TransportType selects the NVMe-oF transport for the internal
// engine<->replica connections of a v2 (SPDK) volume (TCP or RDMA). The
// zero value is TCP, preserving the pre-existing default behavior.
TransportType rpc.TransportType

// Deprecated: replaced by DataEngine.
BackendStoreDriver string
}
Expand Down Expand Up @@ -179,13 +184,14 @@ func (c *InstanceServiceClient) InstanceCreate(req *InstanceCreateRequest) (*api
switch req.InstanceType {
case types.InstanceTypeEngine:
spdkInstanceSpec = &rpc.SpdkInstanceSpec{
Size: req.Size,
ReplicaAddressMap: req.Engine.ReplicaAddressMap,
Frontend: req.Engine.Frontend,
SalvageRequested: req.Engine.SalvageRequested,
SnapshotMaxCount: int32(req.Engine.SnapshotMaxCount),
UblkQueueDepth: int32(req.Engine.UblkQueueDepth),
UblkNumberOfQueue: int32(req.Engine.UblkNumberOfQueue),
Size: req.Size,
ReplicaAddressMap: req.Engine.ReplicaAddressMap,
Frontend: req.Engine.Frontend,
SalvageRequested: req.Engine.SalvageRequested,
SnapshotMaxCount: int32(req.Engine.SnapshotMaxCount),
UblkQueueDepth: int32(req.Engine.UblkQueueDepth),
UblkNumberOfQueue: int32(req.Engine.UblkNumberOfQueue),
TransportType: req.TransportType,
}
case types.InstanceTypeEngineFrontend:
spdkInstanceSpec = &rpc.SpdkInstanceSpec{
Expand All @@ -197,11 +203,12 @@ func (c *InstanceServiceClient) InstanceCreate(req *InstanceCreateRequest) (*api
}
case types.InstanceTypeReplica:
spdkInstanceSpec = &rpc.SpdkInstanceSpec{
Size: req.Size,
DiskName: req.Replica.DiskName,
DiskUuid: req.Replica.DiskUUID,
ExposeRequired: req.Replica.ExposeRequired,
BackingImageName: req.Replica.BackingImageName,
Size: req.Size,
DiskName: req.Replica.DiskName,
DiskUuid: req.Replica.DiskUUID,
ExposeRequired: req.Replica.ExposeRequired,
BackingImageName: req.Replica.BackingImageName,
TransportType: req.TransportType,
}
case types.InstanceTypeShard:
spdkInstanceSpec = &rpc.SpdkInstanceSpec{
Expand Down
20 changes: 18 additions & 2 deletions pkg/instance/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ func (ops V2DataEngineInstanceOps) InstanceCreate(req *rpc.InstanceCreateRequest
engine, err := c.EngineCreate(req.Spec.Name, req.Spec.VolumeName, req.Spec.SpdkInstanceSpec.Frontend, req.Spec.SpdkInstanceSpec.Size,
req.Spec.SpdkInstanceSpec.ReplicaAddressMap, req.Spec.PortCount, req.Spec.SpdkInstanceSpec.SalvageRequested,
req.Spec.SpdkInstanceSpec.SnapshotMaxCount,
convertIMDataLayoutTypeToSPDKDataLayoutType(req.DataLayoutType))
convertIMDataLayoutTypeToSPDKDataLayoutType(req.DataLayoutType),
convertIMTransportTypeToSPDKTransportType(req.Spec.SpdkInstanceSpec.TransportType))
if err != nil {
return nil, err
}
Expand All @@ -210,7 +211,8 @@ func (ops V2DataEngineInstanceOps) InstanceCreate(req *rpc.InstanceCreateRequest
}
return engineFrontendResponseToInstanceResponse(engineFrontend), nil
case types.InstanceTypeReplica:
replica, err := c.ReplicaCreate(req.Spec.Name, req.Spec.SpdkInstanceSpec.DiskName, req.Spec.SpdkInstanceSpec.DiskUuid, req.Spec.SpdkInstanceSpec.Size, req.Spec.PortCount, req.Spec.SpdkInstanceSpec.BackingImageName)
replica, err := c.ReplicaCreate(req.Spec.Name, req.Spec.SpdkInstanceSpec.DiskName, req.Spec.SpdkInstanceSpec.DiskUuid, req.Spec.SpdkInstanceSpec.Size, req.Spec.PortCount, req.Spec.SpdkInstanceSpec.BackingImageName,
convertIMTransportTypeToSPDKTransportType(req.Spec.SpdkInstanceSpec.TransportType))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1352,6 +1354,20 @@ func convertIMDataLayoutTypeToSPDKDataLayoutType(layout rpc.DataLayoutType) spdk
}
}

// convertIMTransportTypeToSPDKTransportType maps the imrpc
// NVMe-oF transport selector to its spdkrpc equivalent. The zero value
// (TRANSPORT_TYPE_TCP) maps to TCP so instances created by an older
// control plane - which never sets the field - keep their historical TCP
// behavior.
func convertIMTransportTypeToSPDKTransportType(transport rpc.TransportType) spdkrpc.TransportType {
switch transport {
case rpc.TransportType_TRANSPORT_TYPE_RDMA:
return spdkrpc.TransportType_TRANSPORT_TYPE_RDMA
default:
return spdkrpc.TransportType_TRANSPORT_TYPE_TCP
}
}

func (s *Server) InstanceDeleteTarget(ctx context.Context, req *rpc.InstanceDeleteTargetRequest) (*emptypb.Empty, error) {
logrus.WithFields(logrus.Fields{
"name": req.Name,
Expand Down