Skip to content

feat: implement ublk frontend for v2 data engine - part 2 #949

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

Merged
derekbit merged 1 commit into from
Apr 17, 2025
Merged

feat: implement ublk frontend for v2 data engine - part 2 #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/google/uuid v1.6.0
github.com/longhorn/backupstore v0.0.0-20250413092739-f882c9e5606b
github.com/longhorn/go-common-libs v0.0.0-20250412054242-0dd2ad39fd02
github.com/longhorn/go-spdk-helper v0.0.2-0.20250415000716-f22355d4e0fa
github.com/longhorn/go-spdk-helper v0.0.0-20250416235331-b97c02bd0b57
github.com/longhorn/longhorn-engine v1.9.0-dev-20250223.0.20250225091521-921f63f3a87d
github.com/longhorn/longhorn-spdk-engine v0.0.0-20250415073054-e79c3d827109
github.com/longhorn/types v0.0.0-20250410134731-b46ad9302858
github.com/longhorn/longhorn-spdk-engine v0.0.0-20250417025732-c02213b70a28
github.com/longhorn/types v0.0.0-20250416235128-0c407ad2b792
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/urfave/cli v1.22.16
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,16 @@ github.com/longhorn/go-common-libs v0.0.0-20250412054242-0dd2ad39fd02 h1:WMiKgxZ
github.com/longhorn/go-common-libs v0.0.0-20250412054242-0dd2ad39fd02/go.mod h1:zUt3YlXyj5wI5SC/jI0ayT42NYlVUXJd2is9Azo0DTw=
github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625 h1:d39A3041RyFve26tIuKUuzrh2CkBY970xlGIXgMA998=
github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625/go.mod h1:yIm3sGRuYOw/Y3XzRhG5+3FlZBOfrU5EZOavzwL2jVs=
github.com/longhorn/go-spdk-helper v0.0.2-0.20250415000716-f22355d4e0fa h1:Toubcr6ADUkjIANoupTcv7ILpxcVE2u5dHPpoSeXix4=
github.com/longhorn/go-spdk-helper v0.0.2-0.20250415000716-f22355d4e0fa/go.mod h1:k1MUTmyAIXuabuyviT3shOnN618449WqmamtCJlsh4c=
github.com/longhorn/go-spdk-helper v0.0.0-20250416235331-b97c02bd0b57 h1:57jJiOMqRVIoFSY2DO9DYHnI4H4uwaUGFGpFqcVDLns=
github.com/longhorn/go-spdk-helper v0.0.0-20250416235331-b97c02bd0b57/go.mod h1:k1MUTmyAIXuabuyviT3shOnN618449WqmamtCJlsh4c=
github.com/longhorn/longhorn-engine v1.9.0-dev-20250223.0.20250225091521-921f63f3a87d h1:JdkTIIaKT0uUU80Ncl26JeAqT727PgPJMaqjf0OUfAE=
github.com/longhorn/longhorn-engine v1.9.0-dev-20250223.0.20250225091521-921f63f3a87d/go.mod h1:qTsHK0nU6Myh4XGnuqfsPG4FpeLh7Vki2hLl/1P0iuc=
github.com/longhorn/longhorn-spdk-engine v0.0.0-20250415073054-e79c3d827109 h1:7wbPxxTbds3n8bh0qcBNFQV70vsPY1VEeDJevV476Eo=
github.com/longhorn/longhorn-spdk-engine v0.0.0-20250415073054-e79c3d827109/go.mod h1:LbnlHPNow1B79MLzY7GJVGv6mdsmNMC8uP2ow5Sm56s=
github.com/longhorn/longhorn-spdk-engine v0.0.0-20250417025732-c02213b70a28 h1:AkQ+E59NgyCqkh8PqPs17mpjL6my5hqH5ijBKUhJyEs=
github.com/longhorn/longhorn-spdk-engine v0.0.0-20250417025732-c02213b70a28/go.mod h1:kZMwCV534EKpYDWXU3oixEbuX6icabTZ6GVw4OQwgv4=
github.com/longhorn/sparse-tools v0.0.0-20241216160947-2b328f0fa59c h1:OFz3haCSPdgiiJvXLBeId/4dPu0dxIEqkQkfNMufLwc=
github.com/longhorn/sparse-tools v0.0.0-20241216160947-2b328f0fa59c/go.mod h1:dfbJqfI8+T9ZCp5zhTYcBi/64hPBNt5/vFF3gTlfMmc=
github.com/longhorn/types v0.0.0-20250410134731-b46ad9302858 h1:1Qe0hwY5i5NMipBg91O2ON4lp3OLO0V1AW7ynQdBtjY=
github.com/longhorn/types v0.0.0-20250410134731-b46ad9302858/go.mod h1:3jHuVDtpkXQzpnp4prguDBskVRric2kmF8aSPkRJ4jw=
github.com/longhorn/types v0.0.0-20250416235128-0c407ad2b792 h1:+KWYQQKGCBnoy7Our2ryJ9HtUksKf3OPaLVMfsxPzMk=
github.com/longhorn/types v0.0.0-20250416235128-0c407ad2b792/go.mod h1:3jHuVDtpkXQzpnp4prguDBskVRric2kmF8aSPkRJ4jw=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
Expand Down
2 changes: 2 additions & 0 deletions pkg/api/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ type InstanceStatus struct {
TargetPortEnd int32 `json:"targetPortEnd"`
StandbyTargetPortStart int32 `json:"standbyTargetPortStart"`
StandbyTargetPortEnd int32 `json:"standbyTargetPortEnd"`
UblkID int32 `json:"ublk_id"`
}

func RPCToInstanceStatus(obj *rpc.InstanceStatus) InstanceStatus {
Expand All @@ -86,6 +87,7 @@ func RPCToInstanceStatus(obj *rpc.InstanceStatus) InstanceStatus {
TargetPortEnd: obj.TargetPortEnd,
StandbyTargetPortStart: obj.StandbyTargetPortStart,
StandbyTargetPortEnd: obj.StandbyTargetPortEnd,
UblkID: obj.UblkId,
}
}

Expand Down
1 change: 1 addition & 0 deletions pkg/instance/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@ func engineResponseToInstanceResponse(e *spdkapi.Engine) *rpc.InstanceResponse {
StandbyTargetPortStart: e.StandbyTargetPort,
StandbyTargetPortEnd: e.StandbyTargetPort,
Conditions: make(map[string]bool),
UblkId: e.UblkID,
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/longhorn/go-spdk-helper/pkg/initiator/initiator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/github.com/longhorn/go-spdk-helper/pkg/initiator/ublk_id_generator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/ublk.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/types/ublk.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/longhorn/longhorn-spdk-engine/pkg/api/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading