From b248413a078a456bed9689e35898e90071f86ce8 Mon Sep 17 00:00:00 2001 From: Alexander Marshalov <_@marshalov.org> Date: Mon, 16 Oct 2023 12:02:51 +0200 Subject: [PATCH] fixed error when creating a full backup using the `-origin` flag (#5180) * fixed error when creating a full backup using the `-origin` flag (#5144) * Update docs/CHANGELOG.md --------- Co-authored-by: Aliaksandr Valialkin --- docs/CHANGELOG.md | 1 + lib/backup/actions/backup.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a8702e31a..6a037ad97 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -51,6 +51,7 @@ The sandbox cluster installation is running under the constant load generated by * BUGFIX: [vmselect](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): improve performance and memory usage during query processing on machines with big number of CPU cores. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5087) for details. * BUGFIX: dashboards: fix vminsert/vmstorage/vmselect metrics filtering when dashboard is used to display data from many sub-clusters with unique job names. Before, only one specific job could have been accounted for component-specific panels, instead of all available jobs for the component. * BUGFIX: [VictoriaMetrics cluster](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): bump hard-coded limit for search query size at `vmstorage` from 1MB to 5MB. The change should be more suitable for real-world scenarios and protect vmstorage from excessive memory usage. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5154) for details +* BUGFIX: [vmbackup](https://docs.victoriametrics.com/vmbackup.html): fix error when creating an incremental backup with the `-origin` command-line flag. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5144) for details. ## [v1.94.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.94.0) diff --git a/lib/backup/actions/backup.go b/lib/backup/actions/backup.go index 1fffc51b9..e870fd899 100644 --- a/lib/backup/actions/backup.go +++ b/lib/backup/actions/backup.go @@ -142,7 +142,7 @@ func runBackup(src *fslocal.FS, dst common.RemoteFS, origin common.OriginFS, con partsToCopy := common.PartsDifference(srcParts, dstParts) originPartsToCopy := common.PartsIntersect(originParts, partsToCopy) copySize := getPartsSize(originPartsToCopy) - if err := copySrcParts(src, dst, originPartsToCopy, concurrency); err != nil { + if err := copySrcParts(origin, dst, originPartsToCopy, concurrency); err != nil { return fmt.Errorf("cannot server-side copy origin parts to dst: %w", err) }