diff --git a/go.mod b/go.mod index 2ea6e68c51..247b12fb50 100644 --- a/go.mod +++ b/go.mod @@ -62,9 +62,9 @@ require ( github.com/kubernetes-csi/csi-lib-utils v0.6.1 github.com/longhorn/backing-image-manager v1.7.2 github.com/longhorn/backupstore v0.0.0-20241124092526-138305866a87 - github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 + github.com/longhorn/go-common-libs v0.0.0-20241128023039-4d6c3a880dbc github.com/longhorn/go-iscsi-helper v0.0.0-20241124090242-e1ca22338f8a - github.com/longhorn/go-spdk-helper v0.0.0-20241124090314-c396ae715a7f + github.com/longhorn/go-spdk-helper v0.0.0-20241128153459-5dae730ad3d2 github.com/longhorn/longhorn-engine v1.7.2 github.com/longhorn/longhorn-instance-manager v1.7.2 github.com/longhorn/longhorn-share-manager v1.7.2 diff --git a/go.sum b/go.sum index bfb9af9257..7f4e93bff0 100644 --- a/go.sum +++ b/go.sum @@ -160,12 +160,12 @@ github.com/longhorn/backing-image-manager v1.7.2 h1:yVu03EE3WmkNWMSdS4M8LciLJqya github.com/longhorn/backing-image-manager v1.7.2/go.mod h1:hsntkXAMiaThQiPDulAbZCUcxKhaiDBX58HPwxa1wZs= github.com/longhorn/backupstore v0.0.0-20241124092526-138305866a87 h1:Alpq8lFYom5Awa80tMDCFIAe2J+vvgLoY3zB6Jhq5B0= 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-common-libs v0.0.0-20241128023039-4d6c3a880dbc h1:Ok7qdNu2038Oj7tQNaKjFqP20NqokR31a3RVMV7ulms= +github.com/longhorn/go-common-libs v0.0.0-20241128023039-4d6c3a880dbc/go.mod h1:gSa+qB058kcNlCaOOwIFPHb3tvqMTmKcxtL7HPTS4o4= github.com/longhorn/go-iscsi-helper v0.0.0-20241124090242-e1ca22338f8a h1:tiyQ1kD9W2XQ0OzOXgX7JnD5Ye/Csu5qrvpJuc9w5YE= github.com/longhorn/go-iscsi-helper v0.0.0-20241124090242-e1ca22338f8a/go.mod h1:U00lu8Y6EtDhX/cMSeRoj39WAlPVA3dYSQBiqz9HFJ4= -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/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/longhorn/longhorn-engine v1.7.2 h1:vinyycvF8zfHQitieUZtcMR6bKjC2dPdiwEm0QVn9YM= github.com/longhorn/longhorn-engine v1.7.2/go.mod h1:WVBJZtUcj3hMoEBJe0PsbdDQ/+9GTu2Tq/mRQc75obQ= github.com/longhorn/longhorn-instance-manager v1.7.2 h1:tl3xq2eJ/SFNPIRyaAIQisNc46dxoe3IoqaP7nDyUCs= 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 19e75bf4d1..d63d53fdfa 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/modules.txt b/vendor/modules.txt index 7dd950d64b..66d2003b2d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -244,7 +244,7 @@ github.com/longhorn/backupstore/logging github.com/longhorn/backupstore/systembackup github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util -# github.com/longhorn/go-common-libs v0.0.0-20241124035508-d6221574e626 +# github.com/longhorn/go-common-libs v0.0.0-20241128023039-4d6c3a880dbc ## explicit; go 1.22.7 github.com/longhorn/go-common-libs/backup github.com/longhorn/go-common-libs/exec @@ -264,7 +264,7 @@ github.com/longhorn/go-iscsi-helper/iscsidev github.com/longhorn/go-iscsi-helper/longhorndev github.com/longhorn/go-iscsi-helper/types github.com/longhorn/go-iscsi-helper/util -# github.com/longhorn/go-spdk-helper v0.0.0-20241124090314-c396ae715a7f +# github.com/longhorn/go-spdk-helper v0.0.0-20241128153459-5dae730ad3d2 ## explicit; go 1.22.7 github.com/longhorn/go-spdk-helper/pkg/types # github.com/longhorn/longhorn-engine v1.7.2