diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 9f046d07e5..6c5678917e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -12,6 +12,8 @@ The following `tip` changes can be tested by building VictoriaMetrics components ## v1.93.x long-time support release (LTS) +* BUGFIX: [vmbackup](https://docs.victoriametrics.com/vmbackup.html): force copying of `data/small/.../parts.json` in order to ensure backup consistency. Previously, `parts.json` could be skipped during copying, which could lead to data loss during restore. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5005). + ## [v1.93.4](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.4) Released at 2023-09-10 diff --git a/lib/backup/actions/backup.go b/lib/backup/actions/backup.go index 7801d1bce4..ae135a96f2 100644 --- a/lib/backup/actions/backup.go +++ b/lib/backup/actions/backup.go @@ -181,6 +181,7 @@ func runBackup(src *fslocal.FS, dst common.RemoteFS, origin common.OriginFS, con } srcCopyParts := common.PartsDifference(partsToCopy, originParts) + srcCopyParts = common.EnforceSpecialsCopy(srcParts, srcCopyParts) uploadSize := getPartsSize(srcCopyParts) if len(srcCopyParts) > 0 { logger.Infof("uploading %d parts from src %s to dst %s", len(srcCopyParts), src, dst) diff --git a/lib/backup/actions/restore.go b/lib/backup/actions/restore.go index 2dd10d0737..5a7434a9e5 100644 --- a/lib/backup/actions/restore.go +++ b/lib/backup/actions/restore.go @@ -144,6 +144,7 @@ func (r *Restore) Run() error { } partsToCopy := common.PartsDifference(srcParts, dstParts) + partsToCopy = common.EnforceSpecialsCopy(srcParts, partsToCopy) downloadSize := getPartsSize(partsToCopy) if len(partsToCopy) > 0 { perPath := make(map[string][]common.Part) diff --git a/lib/backup/common/part.go b/lib/backup/common/part.go index 1b58b66b14..72202472da 100644 --- a/lib/backup/common/part.go +++ b/lib/backup/common/part.go @@ -135,3 +135,31 @@ func PartsIntersect(a, b []Part) []Part { } return d } + +// EnforceSpecialsCopy enforces copying of special parts from src to toCopy without checking whether +// part is already present in dst. +func EnforceSpecialsCopy(src, toCopy []Part) []Part { + // `parts.json` files must be copied from src to dst without checking whether they already exist in dst. + // This is needed because size and paths for those files can be the same even if the contents differ. + // See: https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5005 + filtered := make(map[Part]bool) + for _, pt := range src { + if strings.HasPrefix(pt.Path, "data") && strings.HasSuffix(pt.Path, "parts.json") { + filtered[pt] = false + } + } + + for _, pt := range toCopy { + if _, ok := filtered[pt]; ok { + filtered[pt] = true + } + } + + for pt, ok := range filtered { + if !ok { + toCopy = append(toCopy, pt) + } + } + + return toCopy +}