From 3c13010b895ca926ed9d0e634bf88dcf2a6b1d75 Mon Sep 17 00:00:00 2001 From: Jack Lin Date: Thu, 25 Jan 2024 23:21:31 +0800 Subject: [PATCH] chore: update backupstore version ref: longhorn/longhorn 7744 Signed-off-by: Jack Lin --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/longhorn/backupstore/deltablock.go | 6 ++++++ vendor/modules.txt | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 7c5205c65..77a75fc2c 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/gofrs/flock v0.8.1 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 - github.com/longhorn/backupstore v0.0.0-20240110081942-bd231cfb0c7b + github.com/longhorn/backupstore v0.0.0-20240125112602-1d5129cd1074 github.com/longhorn/go-common-libs v0.0.0-20240109042507-23627e6416b7 github.com/longhorn/go-iscsi-helper v0.0.0-20231220091133-38e296e68ad2 github.com/longhorn/sparse-tools v0.0.0-20230408015858-c849def39d3c diff --git a/go.sum b/go.sum index bcd745623..fb48c890d 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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-20240110081942-bd231cfb0c7b h1:euBbfDb6bnp8KQ5qmbvWWEG7KP6nxhUotLCPGU/x3v0= -github.com/longhorn/backupstore v0.0.0-20240110081942-bd231cfb0c7b/go.mod h1:4cbJWtlrD2cGTQxQLtdlPTYopiJiusXH7CpOBrn/s3k= +github.com/longhorn/backupstore v0.0.0-20240125112602-1d5129cd1074 h1:BqlAk67+OUQQg2qGbvyu0WmUtCYs4ZXG9PEAg+77MU4= +github.com/longhorn/backupstore v0.0.0-20240125112602-1d5129cd1074/go.mod h1:4cbJWtlrD2cGTQxQLtdlPTYopiJiusXH7CpOBrn/s3k= github.com/longhorn/go-common-libs v0.0.0-20240109042507-23627e6416b7 h1:t8F+BjCcn0qqHdVlGktqnEH5EOGigFnAFmVbQPe0nnY= github.com/longhorn/go-common-libs v0.0.0-20240109042507-23627e6416b7/go.mod h1:nIECQARppamt2zwFSdzADRTVKo/7izFwWIS3VWi7D/s= github.com/longhorn/go-iscsi-helper v0.0.0-20231220091133-38e296e68ad2 h1:gUNsw0CDMdKEF4JngW3CnS4eLULhzf2+9c+YaxO0/Pg= diff --git a/vendor/github.com/longhorn/backupstore/deltablock.go b/vendor/github.com/longhorn/backupstore/deltablock.go index d011b3a2a..e2b86947f 100644 --- a/vendor/github.com/longhorn/backupstore/deltablock.go +++ b/vendor/github.com/longhorn/backupstore/deltablock.go @@ -1051,6 +1051,12 @@ func DeleteBackupVolume(volumeName string, destURL string) error { if err != nil { return err } + + // no need to lock and remove volume if it does not exist + if !volumeExists(bsDriver, volumeName) { + return nil + } + lock, err := New(bsDriver, volumeName, DELETION_LOCK) if err != nil { return err diff --git a/vendor/modules.txt b/vendor/modules.txt index 51cdab716..cba459c10 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -133,7 +133,7 @@ github.com/kr/pretty # github.com/kr/text v0.2.0 ## explicit github.com/kr/text -# github.com/longhorn/backupstore v0.0.0-20240110081942-bd231cfb0c7b +# github.com/longhorn/backupstore v0.0.0-20240125112602-1d5129cd1074 ## explicit; go 1.21 github.com/longhorn/backupstore github.com/longhorn/backupstore/azblob