From dedbf8d5ddafc60cc1494c1e814ebb0e88eb72c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 09:08:31 +0000 Subject: [PATCH] fix(deps): update module github.com/longhorn/longhorn-engine to v1.8.0-dev-20240908 --- go.mod | 6 +++--- go.sum | 12 ++++++------ .../longhorn-engine/pkg/replica/diff_disk.go | 2 +- .../github.com/longhorn/sparse-tools/sparse/file.go | 2 +- .../github.com/longhorn/sparse-tools/sparse/sfold.go | 2 +- .../longhorn/sparse-tools/sparse/sprune.go | 2 +- vendor/modules.txt | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index b7621a4a4..cc2ba9213 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/longhorn/backupstore v0.0.0-20240907142840-c1268343d512 github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda github.com/longhorn/go-spdk-helper v0.0.0-20240907134443-f2c9f3529ef6 - github.com/longhorn/longhorn-engine v1.8.0-dev-20240825.0.20240905075622-ecfa3c2bc26f + github.com/longhorn/longhorn-engine v1.8.0-dev-20240908 github.com/longhorn/longhorn-spdk-engine v0.0.0-20240907151113-a8f9ead687c5 github.com/longhorn/types v0.0.0-20240902072916-1bf23d310acb github.com/pkg/errors v0.9.1 @@ -58,8 +58,8 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/longhorn/go-iscsi-helper v0.0.0-20240811043302-df8de353dd58 // indirect - github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff // indirect + github.com/longhorn/go-iscsi-helper v0.0.0-20240907143006-2d71415d9bd3 // indirect + github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect diff --git a/go.sum b/go.sum index dc476f621..afbcf9e4d 100644 --- a/go.sum +++ b/go.sum @@ -109,16 +109,16 @@ github.com/longhorn/backupstore v0.0.0-20240907142840-c1268343d512 h1:zrGVZZTClL github.com/longhorn/backupstore v0.0.0-20240907142840-c1268343d512/go.mod h1:3gjQWnKXqJSxAE6rpM5mrCcbRJyLKXHqgzxyyaLgLSo= github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda h1:+jlHExQsoeb5B8Avl5tc/mX0rDvPDUhTDVbDitvl5vE= github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda/go.mod h1:T8DVg3NdJ7XDNJey+UI1IRUtZKnHtB75MHWmclF6mUI= -github.com/longhorn/go-iscsi-helper v0.0.0-20240811043302-df8de353dd58 h1:fzLAnCLCecoUnsSYyyo7li5GD17xckyBl/zietxz168= -github.com/longhorn/go-iscsi-helper v0.0.0-20240811043302-df8de353dd58/go.mod h1:TobRDCXmF0Ni+jz6+nLJamw3uVu+gNDZoZre1JczGwc= +github.com/longhorn/go-iscsi-helper v0.0.0-20240907143006-2d71415d9bd3 h1:PWXUT0taHZiJU8ItCUmhhJL/m7T3kq2Ak40kfuNbesY= +github.com/longhorn/go-iscsi-helper v0.0.0-20240907143006-2d71415d9bd3/go.mod h1:3f/GmbvwXLWGAnCT1Bj0bb373wd4T48/uZJREbDr//g= github.com/longhorn/go-spdk-helper v0.0.0-20240907134443-f2c9f3529ef6 h1:9H2GjbvERQuS0HFiXJlZBmFWBduQhl0Nw7Znj/yV6LE= github.com/longhorn/go-spdk-helper v0.0.0-20240907134443-f2c9f3529ef6/go.mod h1:Hxn5CTNfYCx1EEQ5YLOSnsI65H9CJAXHioqXx6xx1D0= -github.com/longhorn/longhorn-engine v1.8.0-dev-20240825.0.20240905075622-ecfa3c2bc26f h1:d6UjaruyQFXMoCPYmcf9SfP1svCokONAHblpjJ6XXcc= -github.com/longhorn/longhorn-engine v1.8.0-dev-20240825.0.20240905075622-ecfa3c2bc26f/go.mod h1:WxnRZefYEMqrTn4H189DTqIPeKEAknNlmQjoAOk9K38= +github.com/longhorn/longhorn-engine v1.8.0-dev-20240908 h1:pEUQEGnFyYC2B20W3Ak48RuYYkwLxBmiGHHTYwT3Tp8= +github.com/longhorn/longhorn-engine v1.8.0-dev-20240908/go.mod h1:V7Xiua0i9swgX8m69qSbFZyJ0qQaARnaUlkbdM5Vsls= github.com/longhorn/longhorn-spdk-engine v0.0.0-20240907151113-a8f9ead687c5 h1:hdvbAEUp9JFJwImI54DtV3XzeN5xuu2zAAZoxyaURww= github.com/longhorn/longhorn-spdk-engine v0.0.0-20240907151113-a8f9ead687c5/go.mod h1:9Ho1a/NNpa/pUSartvzavJPOERXkNmkGl3MAIsalPVo= -github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff h1:gmdQDbnaGJ/zmrK+QJzSys8mH679os6i7vW/pOpRn1U= -github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff/go.mod h1:iUJCZtOKG/9xv2rfrUAYZntFTzP5dZtvy4Kwe6dMcUc= +github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d h1:iNrrGcE9TLcaayQgOkdEZDvlzKCWMNhXXJD2d2K4Wyo= +github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d/go.mod h1:iUJCZtOKG/9xv2rfrUAYZntFTzP5dZtvy4Kwe6dMcUc= github.com/longhorn/types v0.0.0-20240902072916-1bf23d310acb h1:8CoW5YYn+SC43o5zFR+wscOd3SgF6rQZjrkXOkJfZPM= github.com/longhorn/types v0.0.0-20240902072916-1bf23d310acb/go.mod h1:KlJuZB8NfHchWshYxYgV9pPIxBKC04Vq05G2TfgMf7w= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/vendor/github.com/longhorn/longhorn-engine/pkg/replica/diff_disk.go b/vendor/github.com/longhorn/longhorn-engine/pkg/replica/diff_disk.go index 4be04ff13..1406dfb19 100644 --- a/vendor/github.com/longhorn/longhorn-engine/pkg/replica/diff_disk.go +++ b/vendor/github.com/longhorn/longhorn-engine/pkg/replica/diff_disk.go @@ -271,7 +271,7 @@ func (d *diffDisk) lookup(sector int64) (byte, error) { for i := len(d.files) - 1; i > 1; i-- { e, errno := fibmap.Fiemap(d.files[i].Fd(), uint64(sector*d.sectorSize), uint64(d.sectorSize), 1) if errno != 0 { - return 0, fmt.Errorf(errno.Error()) + return 0, fmt.Errorf("%v", errno) } if len(e) > 0 { d.location[sector] = byte(i) diff --git a/vendor/github.com/longhorn/sparse-tools/sparse/file.go b/vendor/github.com/longhorn/sparse-tools/sparse/file.go index 187f13a4d..17624bd6a 100644 --- a/vendor/github.com/longhorn/sparse-tools/sparse/file.go +++ b/vendor/github.com/longhorn/sparse-tools/sparse/file.go @@ -347,7 +347,7 @@ func GetFiemapRegionExts(file FileIoProcessor, interval Interval, extCount int) _, exts, errno := file.GetFieMap().FiemapRegion(uint32(extCount), uint64(interval.Begin), uint64(interval.End-interval.Begin)) if errno != 0 { log.Error("Failed to call fiemap.Fiemap(extCount)") - return exts, fmt.Errorf(errno.Error()) + return exts, fmt.Errorf("%v", errno) } log.Tracef("Retrieved %v/%v extents from file %v, interval %+v, elapsed %.2fs", diff --git a/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go b/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go index cfdfe80eb..480e59da1 100644 --- a/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go +++ b/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go @@ -64,7 +64,7 @@ func coalesce(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops Fil defer func() { if err != nil { - log.Errorf(err.Error()) + log.Errorf("%v", err) updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops) } else { updateProgress(progress, progressComplete, true, nil, progressMutex, ops) diff --git a/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go b/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go index 773d0af06..3940b51ca 100644 --- a/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go +++ b/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go @@ -60,7 +60,7 @@ func prune(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops FileHa defer func() { if err != nil { - log.Errorf(err.Error()) + log.Errorf("%v", err) updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops) } else { updateProgress(progress, progressComplete, true, nil, progressMutex, ops) diff --git a/vendor/modules.txt b/vendor/modules.txt index 393d8bc65..343a2ed86 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -238,7 +238,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-iscsi-helper v0.0.0-20240811043302-df8de353dd58 +# github.com/longhorn/go-iscsi-helper v0.0.0-20240907143006-2d71415d9bd3 ## explicit; go 1.22.0 github.com/longhorn/go-iscsi-helper/iscsi github.com/longhorn/go-iscsi-helper/iscsidev @@ -254,7 +254,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/longhorn-engine v1.8.0-dev-20240825.0.20240905075622-ecfa3c2bc26f +# github.com/longhorn/longhorn-engine v1.8.0-dev-20240908 ## explicit; go 1.22.2 github.com/longhorn/longhorn-engine/pkg/backingfile github.com/longhorn/longhorn-engine/pkg/controller/client @@ -280,7 +280,7 @@ github.com/longhorn/longhorn-spdk-engine/pkg/spdk/disk/virtio-scsi github.com/longhorn/longhorn-spdk-engine/pkg/types github.com/longhorn/longhorn-spdk-engine/pkg/util github.com/longhorn/longhorn-spdk-engine/pkg/util/broadcaster -# github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff +# github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d ## explicit; go 1.22.0 github.com/longhorn/sparse-tools/sparse github.com/longhorn/sparse-tools/types