Add missing regex to backup manager

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10901/diffs introduced a new naming scheme for backups, but the code which cleans up old backups wasn't updated accordingly. In order to maintain backward compatibility, we need to account for 3 naming schemes.

Add missing regex to backup manager
450e2cd8 · Achilleas Pipinellis · 4c8d478e · 450e2cd8
Commit 450e2cd8 authored May 23, 2017 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

manager.rb lib/backup/manager.rb +6 -1

No files found.
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -84,7 +84,12 @@ module Backup

        Dir.chdir(backup_path) do
          backup_file_list.each do |file|
-            next unless file =~ /(\d+)(?:_\d{4}_\d{2}_\d{2})?_gitlab_backup\.tar/
+
+            # For backward compatibility, there are 3 names the backups can have:
+            # - 1495527122_gitlab_backup.tar
+            # - 1495527068_2017_05_23_gitlab_backup.tar
+            # - 1495527097_2017_05_23_9.3.0-pre_gitlab_backup.tar
+            next unless file =~ /(\d+)(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+.*)?)?_gitlab_backup\.tar$/

            timestamp = $1.to_i