From 3df3a6acadc55b4854fa6d1cc63da4e64a0c0d81 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Thu, 28 Nov 2024 16:13:25 +0000 Subject: [PATCH] chore(vendor): update dependencies Longhorn 9104 Signed-off-by: Derek Su --- go.mod | 6 ++++-- go.sum | 12 ++++++------ .../longhorn/go-spdk-helper/pkg/types/types.go | 7 ++++--- .../longhorn/types/pkg/generated/spdkrpc/spdk.pb.go | 13 ++++++++++++- vendor/modules.txt | 6 +++--- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 0d672a4e..3b2f565a 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ require ( github.com/0xPolygon/polygon-edge v1.3.3 github.com/google/uuid v1.6.0 github.com/longhorn/backupstore v0.0.0-20241117040525-542fb2c66652 - github.com/longhorn/go-common-libs v0.0.0-20241123075700-b6fce15463ce - github.com/longhorn/go-spdk-helper v0.0.0-20241123080431-7e915c6e2fc5 + github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 + github.com/longhorn/go-spdk-helper v0.0.0-20241128153459-5dae730ad3d2 github.com/longhorn/types v0.0.0-20241123075624-48c550af4eab github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 @@ -59,3 +59,5 @@ require ( k8s.io/mount-utils v0.31.3 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect ) + +replace github.com/longhorn/types v0.0.0-20241123075624-48c550af4eab => github.com/derekbit/longhorn-types v0.0.0-20241128141620-e298a5a080b7 diff --git a/go.sum b/go.sum index 7ed696f0..dbaab0f5 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/derekbit/longhorn-types v0.0.0-20241128141620-e298a5a080b7 h1:iuOCk/GzWJKVCyVOzp8bfErGusrHuaSHJxFjyID07PM= +github.com/derekbit/longhorn-types v0.0.0-20241128141620-e298a5a080b7/go.mod h1:dIPa2yMBPOa514bn3pohT7kbVAQcZbZSWItpgxunuPs= github.com/gammazero/deque v0.2.0 h1:SkieyNB4bg2/uZZLxvya0Pq6diUlwx7m2TeT7GAIWaA= github.com/gammazero/deque v0.2.0/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU= github.com/gammazero/workerpool v1.1.3 h1:WixN4xzukFoN0XSeXF6puqEqFTl2mECI9S6W44HWy9Q= @@ -46,12 +48,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/longhorn/backupstore v0.0.0-20241117040525-542fb2c66652 h1:dFyoMEJ9BJPZuyLuGbwn+eM7JBSC41OrdBbpU87Myjs= github.com/longhorn/backupstore v0.0.0-20241117040525-542fb2c66652/go.mod h1:yBN36ckVhgnTk4EDPws5AwFlWu+1SrC1QxHeYGk98JM= -github.com/longhorn/go-common-libs v0.0.0-20241123075700-b6fce15463ce h1:6hmmPtH5KRosHGvs3XTXhJ3NLKvrQmgihcBcZyf/KHw= -github.com/longhorn/go-common-libs v0.0.0-20241123075700-b6fce15463ce/go.mod h1:bzIBhK5G4/qrGy6LKu6b2Z1SdzwICqCQoYQXYQI2orQ= -github.com/longhorn/go-spdk-helper v0.0.0-20241123080431-7e915c6e2fc5 h1:Qkcg7pTiXtVZQ/ojTwKfrA6Dw8hjJkO+IgJ2vgF6Q48= -github.com/longhorn/go-spdk-helper v0.0.0-20241123080431-7e915c6e2fc5/go.mod h1:J1FxfQmH/OxkQ/18fqBwdx7Qeny80sZ8y0XKU9ceZw8= -github.com/longhorn/types v0.0.0-20241123075624-48c550af4eab h1:vW/sSHB0U/GPnornD1cdoKSEe9bdBwVKP68cZUs1Xh0= -github.com/longhorn/types v0.0.0-20241123075624-48c550af4eab/go.mod h1:dIPa2yMBPOa514bn3pohT7kbVAQcZbZSWItpgxunuPs= +github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 h1:6RHxLM2DLwr7FrDn6yyryEXwa7yN01fcZfIyllxmBss= +github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626/go.mod h1:gSa+qB058kcNlCaOOwIFPHb3tvqMTmKcxtL7HPTS4o4= +github.com/longhorn/go-spdk-helper v0.0.0-20241128153459-5dae730ad3d2 h1:oGOcz2f7KWpzcSc25awK8xQuCJRS2f411Jo+gmoblOU= +github.com/longhorn/go-spdk-helper v0.0.0-20241128153459-5dae730ad3d2/go.mod h1:F4KxpqJXmghH0E3GH0XRSr7M0v5DROFEwaecPbhnGY4= 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/types/types.go b/vendor/github.com/longhorn/go-spdk-helper/pkg/types/types.go index 19e75bf4..d63d53fd 100644 --- a/vendor/github.com/longhorn/go-spdk-helper/pkg/types/types.go +++ b/vendor/github.com/longhorn/go-spdk-helper/pkg/types/types.go @@ -22,10 +22,11 @@ const ( ShallowCopyStateComplete = "complete" ShallowCopyStateError = "error" - DefaultCtrlrLossTimeoutSec = 30 - // DefaultReconnectDelaySec can't be more than DefaultFastIoFailTimeoutSec, same for non-default values. + DefaultCtrlrLossTimeoutSec = 15 + // DefaultReconnectDelaySec can't be more than DefaultFastIOFailTimeoutSec. DefaultReconnectDelaySec = 2 - DefaultFastIOFailTimeoutSec = 15 + DefaultFastIOFailTimeoutSec = 10 + // DefaultTransportAckTimeout value is not the timeout second. // The timeout formula is 2^(transport_ack_timeout) msec. // DefaultTransportAckTimeout is 14, so the default timeout is 2^14 = 16384 msec = 16.384 sec. 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 2338547a..9daac47e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -51,7 +51,7 @@ github.com/longhorn/backupstore github.com/longhorn/backupstore/logging github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util -# github.com/longhorn/go-common-libs v0.0.0-20241123075700-b6fce15463ce +# github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 ## explicit; go 1.22.7 github.com/longhorn/go-common-libs/backup github.com/longhorn/go-common-libs/bitmap @@ -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-20241123080431-7e915c6e2fc5 +# github.com/longhorn/go-spdk-helper v0.0.0-20241128153459-5dae730ad3d2 ## 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-20241123075624-48c550af4eab +# github.com/longhorn/types v0.0.0-20241123075624-48c550af4eab => github.com/derekbit/longhorn-types v0.0.0-20241128141620-e298a5a080b7 ## explicit; go 1.22.7 github.com/longhorn/types/pkg/generated/spdkrpc # github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0