Skip to content

Fix backup id and timestamp handling in backup utility

Clemens Beck requested to merge backup-timestamp-fixes into master

What does this MR do?

Implement fixes discussed in gitlab-org/charts/gitlab#5074 (comment 1634780062):

Fix backup id and timestamp handling in backup utility

* Fixes mismatch of the root and the repository backup timestamp.
* Fixes incorrectly parsed backup id on restore.
* Fixes unset backup id on backup creation.

Changelog: fixed

This blocks gitlab-org/charts/gitlab!3468 (merged).

Test Plan

  1. Install a 7.5 chart
  2. Restore the 7.1 CI backup
  3. Upgrade Chart to use this branch's images (--set global.gitlabVersion=backup-timestamp-fixes --set gitlab.gitaly.image.tag=backup-timestamp-fixes)
  4. Create a new backup
    • Confirm metadata is present
    • Confirm archive name, repository backup and and created_at in backup_info.yml have matching timestamps
  5. Restore from the backup
    • Login and confirm root/testproject1 exists and has a non-empty repo

Related issues

Relates gitlab-org/charts/gitlab#5074 (closed)

Closes #781 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Integration tests added to GitLab QA
  • The impact any change in container size has should be evaluated
  • New dependencies are managed with dependencies.io
Edited by Clemens Beck

Merge request reports