From 4eec71b99a0269a95ec51a3f6772f3f1ef8c5374 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Tue, 10 Dec 2024 11:31:32 +0800 Subject: [PATCH] chore(vendor): update dependencies Longhorn 9104 Signed-off-by: Derek Su --- go.mod | 4 ++-- go.sum | 8 ++++---- .../go-spdk-helper/pkg/spdk/client/basic.go | 8 ++++---- .../longhorn/go-spdk-helper/pkg/spdk/types/lvol.go | 4 ++-- .../longhorn/types/pkg/generated/spdkrpc/spdk.pb.go | 13 ++++++++++++- vendor/modules.txt | 4 ++-- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 2c76d5ba..c7bbf953 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/google/uuid v1.6.0 github.com/longhorn/backupstore v0.0.0-20241208060255-5c474bb003bd github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078 - github.com/longhorn/go-spdk-helper v0.0.0-20241209014045-079275cb3845 - github.com/longhorn/types v0.0.0-20241208031854-891e672bc453 + github.com/longhorn/go-spdk-helper v0.0.0-20241209015745-e5a448a84da0 + github.com/longhorn/types v0.0.0-20241210031954-9a7c220696fd github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 go.uber.org/multierr v1.11.0 diff --git a/go.sum b/go.sum index 26a71e8e..4105ae52 100644 --- a/go.sum +++ b/go.sum @@ -48,10 +48,10 @@ github.com/longhorn/backupstore v0.0.0-20241208060255-5c474bb003bd h1:lcqAEYf2+Z github.com/longhorn/backupstore v0.0.0-20241208060255-5c474bb003bd/go.mod h1:35urUcY2wO9lgFQnoR4l9i4Hc/x/fNzI8Pn/dloPSd0= github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078 h1:QnN9bPRhWr38ziOdknlC+NORk0PgQJcPX1vo20oVi9I= github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078/go.mod h1:whDcaYDin1L7uaKTpr86RxpfOT+VJQbubDWdEGPnvVs= -github.com/longhorn/go-spdk-helper v0.0.0-20241209014045-079275cb3845 h1:UpwS/9KZN34T2C9a8vYaJPPNWqdWOTkDBceMSipsq8M= -github.com/longhorn/go-spdk-helper v0.0.0-20241209014045-079275cb3845/go.mod h1:isAM1U36SWOh7XWfktlbveHWSLXV3HfEF7p/tyNqAUQ= -github.com/longhorn/types v0.0.0-20241208031854-891e672bc453 h1:NdPh1ARYoBnFqCn3sRNJXa+WeJZcS+J0wXpJBou26KM= -github.com/longhorn/types v0.0.0-20241208031854-891e672bc453/go.mod h1:ZElOIs7s/Cjaw7P9kY+uvTzh87mfO34pk39B6TVmg0g= +github.com/longhorn/go-spdk-helper v0.0.0-20241209015745-e5a448a84da0 h1:NUlDG47Y0Fl7grLtQtP67++t9T9BSS6CEn9JKEoxOEA= +github.com/longhorn/go-spdk-helper v0.0.0-20241209015745-e5a448a84da0/go.mod h1:isAM1U36SWOh7XWfktlbveHWSLXV3HfEF7p/tyNqAUQ= +github.com/longhorn/types v0.0.0-20241210031954-9a7c220696fd h1:cuX5B+R2o67CXzy3+6ZCu388bb/UTETZ8ND1nPu0Zy0= +github.com/longhorn/types v0.0.0-20241210031954-9a7c220696fd/go.mod h1:ZElOIs7s/Cjaw7P9kY+uvTzh87mfO34pk39B6TVmg0g= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= diff --git a/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/basic.go b/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/basic.go index e257dabb..79965ea4 100644 --- a/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/basic.go +++ b/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/client/basic.go @@ -412,11 +412,11 @@ func (c *Client) BdevLvolSetParent(lvol, parent string) (set bool, err error) { // // "name": Required. UUID or alias of the logical volume to resize. // -// "size": Required. Desired size of the logical volume in bytes. -func (c *Client) BdevLvolResize(name string, size uint64) (resized bool, err error) { +// "sizeInMib": Required. Desired size of the logical volume in bytes. +func (c *Client) BdevLvolResize(name string, sizeInMib uint64) (resized bool, err error) { req := spdktypes.BdevLvolResizeRequest{ - Name: name, - Size: size, + Name: name, + SizeInMib: sizeInMib, } cmdOutput, err := c.jsonCli.SendCommand("bdev_lvol_resize", req) diff --git a/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/types/lvol.go b/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/types/lvol.go index a246b4f2..6f36b4e6 100644 --- a/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/types/lvol.go +++ b/vendor/github.com/longhorn/go-spdk-helper/pkg/spdk/types/lvol.go @@ -130,8 +130,8 @@ type BdevLvolSetParentRequest struct { } type BdevLvolResizeRequest struct { - Name string `json:"name"` - Size uint64 `json:"size"` + Name string `json:"name"` + SizeInMib uint64 `json:"size_in_mib"` } type BdevLvolShallowCopyRequest struct { diff --git a/vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go b/vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go index 871232c4..338df5cd 100644 --- a/vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go +++ b/vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go @@ -1541,6 +1541,7 @@ type Engine struct { ErrorMsg string `protobuf:"bytes,14,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"` TargetIp string `protobuf:"bytes,15,opt,name=target_ip,json=targetIp,proto3" json:"target_ip,omitempty"` TargetPort int32 `protobuf:"varint,16,opt,name=target_port,json=targetPort,proto3" json:"target_port,omitempty"` + StandbyTargetPort int32 `protobuf:"varint,17,opt,name=standby_target_port,json=standbyTargetPort,proto3" json:"standby_target_port,omitempty"` } func (x *Engine) Reset() { @@ -1687,6 +1688,13 @@ func (x *Engine) GetTargetPort() int32 { return 0 } +func (x *Engine) GetStandbyTargetPort() int32 { + if x != nil { + return x.StandbyTargetPort + } + return 0 +} + type EngineCreateRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -4435,7 +4443,7 @@ var file_spdkrpc_spdk_proto_rawDesc = []byte{ 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x6c, 0x76, 0x6f, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x18, 0x64, 0x73, 0x74, 0x52, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x6f, 0x6c, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x22, 0xbc, 0x06, 0x0a, 0x06, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x12, + 0x72, 0x65, 0x73, 0x73, 0x22, 0xec, 0x06, 0x0a, 0x06, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, @@ -4472,6 +4480,9 @@ var file_spdkrpc_spdk_proto_rawDesc = []byte{ 0x67, 0x65, 0x74, 0x5f, 0x69, 0x70, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x70, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x61, 0x72, + 0x67, 0x65, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x74, 0x61, 0x6e, 0x64, + 0x62, 0x79, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x11, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x62, 0x79, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x1a, 0x44, 0x0a, 0x16, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, diff --git a/vendor/modules.txt b/vendor/modules.txt index 7e1b600d..15328633 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -64,7 +64,7 @@ github.com/longhorn/go-common-libs/sync github.com/longhorn/go-common-libs/sys github.com/longhorn/go-common-libs/types github.com/longhorn/go-common-libs/utils -# github.com/longhorn/go-spdk-helper v0.0.0-20241209014045-079275cb3845 +# github.com/longhorn/go-spdk-helper v0.0.0-20241209015745-e5a448a84da0 ## explicit; go 1.22.7 github.com/longhorn/go-spdk-helper/pkg/jsonrpc github.com/longhorn/go-spdk-helper/pkg/nvme @@ -73,7 +73,7 @@ github.com/longhorn/go-spdk-helper/pkg/spdk/setup github.com/longhorn/go-spdk-helper/pkg/spdk/types github.com/longhorn/go-spdk-helper/pkg/types github.com/longhorn/go-spdk-helper/pkg/util -# github.com/longhorn/types v0.0.0-20241208031854-891e672bc453 +# github.com/longhorn/types v0.0.0-20241210031954-9a7c220696fd ## explicit; go 1.22.7 github.com/longhorn/types/pkg/generated/spdkrpc # github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0