From 2058a1e0ba164c18c72f61aeaa749f772b0fdf32 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Thu, 28 Nov 2024 18:09:39 +0800 Subject: [PATCH] chore(vendor): update dependencies Longhorn 9874 Signed-off-by: Derek Su --- go.mod | 2 ++ go.sum | 4 ++-- .../go-spdk-helper/pkg/spdk/client/basic.go | 15 +++------------ .../longhorn/go-spdk-helper/pkg/types/types.go | 8 +++++++- vendor/modules.txt | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index de966ce2..d3d836f7 100644 --- a/go.mod +++ b/go.mod @@ -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/go-spdk-helper v0.0.0-20241124090314-c396ae715a7f => github.com/derekbit/go-spdk-helper v0.0.0-20241128092108-a0fbefe3bbde diff --git a/go.sum b/go.sum index 7b9a0b66..9bb282ac 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/go-spdk-helper v0.0.0-20241128092108-a0fbefe3bbde h1:8/tOGUgZqYtWzYzT5qJPNJ+2Kdh2Lr17CrOlljanV8A= +github.com/derekbit/go-spdk-helper v0.0.0-20241128092108-a0fbefe3bbde/go.mod h1:F4KxpqJXmghH0E3GH0XRSr7M0v5DROFEwaecPbhnGY4= 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= @@ -48,8 +50,6 @@ github.com/longhorn/backupstore v0.0.0-20241124092526-138305866a87 h1:Alpq8lFYom github.com/longhorn/backupstore v0.0.0-20241124092526-138305866a87/go.mod h1:43jaLhUmWSpP2TekZslfLcFBqFTe07Eucgv7hRst5Pw= 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-20241124090314-c396ae715a7f h1:P/XoCIN6+4q05tCTRAsSsVLMC8c0NV31HCkn+6xKrsc= -github.com/longhorn/go-spdk-helper v0.0.0-20241124090314-c396ae715a7f/go.mod h1:F4KxpqJXmghH0E3GH0XRSr7M0v5DROFEwaecPbhnGY4= 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/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= 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..a90a6495 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 @@ -770,22 +770,13 @@ func (c *Client) BdevNvmeGetControllers(name string) (controllerInfoList []spdkt // Parameters, ctrlr_loss_timeout_sec, reconnect_delay_sec, and fast_io_fail_timeout_sec, are // for I/O error resiliency. They can be overridden if they are given by the RPC bdev_nvme_attach_controller. // -// "ctrlrLossTimeoutSec": Controller loss timeout in seconds -// -// "reconnectDelaySec": Controller reconnect delay in seconds -// -// "fastIOFailTimeoutSec": Fast I/O failure timeout in seconds -// // "transportAckTimeout": Time to wait ack until retransmission for RDMA or connection close for TCP. Range 0-31 where 0 means use default // // "keepAliveTimeoutMs": Keep alive timeout in milliseconds. -func (c *Client) BdevNvmeSetOptions(ctrlrLossTimeoutSec, reconnectDelaySec, fastIOFailTimeoutSec, transportAckTimeout, keepAliveTimeoutMs int32) (result bool, err error) { +func (c *Client) BdevNvmeSetOptions(transportAckTimeout, keepAliveTimeoutMs int32) (result bool, err error) { req := spdktypes.BdevNvmeSetOptionsRequest{ - CtrlrLossTimeoutSec: ctrlrLossTimeoutSec, - ReconnectDelaySec: reconnectDelaySec, - FastIOFailTimeoutSec: fastIOFailTimeoutSec, - TransportAckTimeout: transportAckTimeout, - KeepAliveTimeoutMs: keepAliveTimeoutMs, + TransportAckTimeout: transportAckTimeout, + KeepAliveTimeoutMs: keepAliveTimeoutMs, } cmdOutput, err := c.jsonCli.SendCommand("bdev_nvme_set_options", req) 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..0b244209 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 @@ -23,9 +23,15 @@ const ( ShallowCopyStateError = "error" DefaultCtrlrLossTimeoutSec = 30 - // DefaultReconnectDelaySec can't be more than DefaultFastIoFailTimeoutSec, same for non-default values. + // DefaultReplicaReconnectDelaySec can't be more than DefaultReplicaFastIOFailTimeoutSec, same for non-default values. DefaultReconnectDelaySec = 2 DefaultFastIOFailTimeoutSec = 15 + + DefaultReplicaCtrlrLossTimeoutSec = 15 + // DefaultReplicaReconnectDelaySec can't be more than DefaultReplicaFastIOFailTimeoutSec, same for non-default values. + DefaultReplicaReconnectDelaySec = 2 + DefaultReplicaFastIOFailTimeoutSec = 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/modules.txt b/vendor/modules.txt index 2858881f..aedf5213 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-20241124090314-c396ae715a7f +# github.com/longhorn/go-spdk-helper v0.0.0-20241124090314-c396ae715a7f => github.com/derekbit/go-spdk-helper v0.0.0-20241128092108-a0fbefe3bbde ## explicit; go 1.22.7 github.com/longhorn/go-spdk-helper/pkg/jsonrpc github.com/longhorn/go-spdk-helper/pkg/nvme