diff --git a/go.mod b/go.mod index a3cfb677db..9e6f4c529a 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/jinzhu/copier v0.3.5 github.com/kubernetes-csi/csi-lib-utils v0.6.1 github.com/longhorn/backing-image-manager v1.6.4 - github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9 + github.com/longhorn/backupstore v0.0.0-20250227220202-651bd33886fe github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625 github.com/longhorn/go-spdk-helper v0.0.0-20240308030201-9b252d6f7250 diff --git a/go.sum b/go.sum index 815c8f7c00..d67e3dde31 100644 --- a/go.sum +++ b/go.sum @@ -1048,8 +1048,8 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/longhorn/backing-image-manager v1.6.4 h1:S2t8+8gk8zuNiI11A6eIPlU81swjopbNjv8XEcTvFoI= github.com/longhorn/backing-image-manager v1.6.4/go.mod h1:9HIc5SxWnWmhoikYm8Bt0GhVEQKNgz7alsppeAk4haw= -github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9 h1:TDLyWqxfdLOyniw3lQy9oFcX6hVaURRSSmbNfmKGXEY= -github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9/go.mod h1:68UurOCxyLbFS/490FPo+q2G/7iJXfPwI33eNm1m3D8= +github.com/longhorn/backupstore v0.0.0-20250227220202-651bd33886fe h1:94FXqrJeaXrwuQNk4GLz0SSaMKT90Zcu1Uhu0qVb5EM= +github.com/longhorn/backupstore v0.0.0-20250227220202-651bd33886fe/go.mod h1:68UurOCxyLbFS/490FPo+q2G/7iJXfPwI33eNm1m3D8= github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e h1:QxJaa0Jo3yGWXrxk317mH1KJwgz7SwDldH1ec/yNEss= github.com/longhorn/go-common-libs v0.0.0-20250215052214-151615b29f8e/go.mod h1:qDoXeH6jrSofJyr3ubwwhlptIKHHsQwTsm5TpNTs1B0= github.com/longhorn/go-iscsi-helper v0.0.0-20250111093313-7e1930499625 h1:d39A3041RyFve26tIuKUuzrh2CkBY970xlGIXgMA998= diff --git a/vendor/github.com/longhorn/backupstore/backupstore.go b/vendor/github.com/longhorn/backupstore/backupstore.go index 9ff25c0961..e4f54bc0aa 100644 --- a/vendor/github.com/longhorn/backupstore/backupstore.go +++ b/vendor/github.com/longhorn/backupstore/backupstore.go @@ -56,6 +56,11 @@ type Backup struct { SingleFile BackupFile `json:",omitempty"` } +type LastBackupInfo struct { + Name string + SnapshotCreatedAt string +} + var ( backupstoreBase = "backupstore" ) diff --git a/vendor/github.com/longhorn/backupstore/deltablock.go b/vendor/github.com/longhorn/backupstore/deltablock.go index 6c14ba49d1..6b8a94a55c 100644 --- a/vendor/github.com/longhorn/backupstore/deltablock.go +++ b/vendor/github.com/longhorn/backupstore/deltablock.go @@ -1196,12 +1196,16 @@ func checkBlockReferenceCount(blockInfos map[string]*BlockInfo, backup *Backup, } } +func copyLastBackupInfo(backup *Backup, lastBackup *LastBackupInfo) { + lastBackup.Name = backup.Name + lastBackup.SnapshotCreatedAt = backup.SnapshotCreatedAt +} + // getLatestBackup replace lastBackup object if the found // backup.SnapshotCreatedAt time is greater than the lastBackup -func getLatestBackup(backup *Backup, lastBackup *Backup) error { +func getLatestBackup(backup *Backup, lastBackup *LastBackupInfo) error { if lastBackup.SnapshotCreatedAt == "" { - // FIXME - go lint points out that this copies a potentially locked sync.mutex - *lastBackup = *backup // nolint:govet + copyLastBackupInfo(backup, lastBackup) return nil } @@ -1216,8 +1220,7 @@ func getLatestBackup(backup *Backup, lastBackup *Backup) error { } if backupTime.After(lastBackupTime) { - // FIXME - go lint points out that this copies a potentially locked sync.mutex - *lastBackup = *backup // nolint:govet + copyLastBackupInfo(backup, lastBackup) } return nil @@ -1299,7 +1302,7 @@ func DeleteDeltaBlockBackup(backupURL string) error { } } - lastBackup := &Backup{} + lastBackup := &LastBackupInfo{} for _, name := range backupNames { log := log.WithField("backup", name) backup, err := loadBackup(bsDriver, name, volumeName) diff --git a/vendor/modules.txt b/vendor/modules.txt index 448f6cc343..acecc71dc0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -231,7 +231,7 @@ github.com/longhorn/backing-image-manager/pkg/meta github.com/longhorn/backing-image-manager/pkg/rpc github.com/longhorn/backing-image-manager/pkg/types github.com/longhorn/backing-image-manager/pkg/util -# github.com/longhorn/backupstore v0.0.0-20250215022153-7ee3a979f2a9 +# github.com/longhorn/backupstore v0.0.0-20250227220202-651bd33886fe ## explicit; go 1.22.7 github.com/longhorn/backupstore github.com/longhorn/backupstore/backupbackingimage