Commit 06dcab68 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'litvinov.evgeny/7314-backup-files-skip-warning' into 'master'

7314: backup/files: Skip tar warnings while backup procedure when files/folders changed

See merge request gitlab-org/gitlab!40572
parents 8bda24d2 1bf72a19
---
title: Skip warning for file changed during backup instead of failing the backup operation
merge_request: 40572
author:
type: fixed
...@@ -31,10 +31,10 @@ module Backup ...@@ -31,10 +31,10 @@ module Backup
raise Backup::Error, 'Backup failed' raise Backup::Error, 'Backup failed'
end end
run_pipeline!([%W(#{tar} --exclude=lost+found -C #{@backup_files_dir} -cf - .), gzip_cmd], out: [backup_tarball, 'w', 0600]) run_pipeline!([%W(#{tar} --warning=no-file-changed --exclude=lost+found -C #{@backup_files_dir} -cf - .), gzip_cmd], out: [backup_tarball, 'w', 0600])
FileUtils.rm_rf(@backup_files_dir) FileUtils.rm_rf(@backup_files_dir)
else else
run_pipeline!([%W(#{tar} --exclude=lost+found -C #{app_files_dir} -cf - .), gzip_cmd], out: [backup_tarball, 'w', 0600]) run_pipeline!([%W(#{tar} --warning=no-file-changed --exclude=lost+found -C #{app_files_dir} -cf - .), gzip_cmd], out: [backup_tarball, 'w', 0600])
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment