github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 07:31:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not migrate backups in the new prefix

Browse Source
This commit is contained in:
Andrew Schleifer
2020-06-12 02:55:50 +00:00
parent 3aab98781a
commit b2c94cc8ea
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/backup_restore/s3_backup_store.rb
View File

@ -53,9 +53,11 @@ module BackupRestore
def vacate_legacy_prefix def vacate_legacy_prefix
legacy_s3_helper = S3Helper.new(s3_bucket_name_with_legacy_prefix, '', @s3_options.clone) legacy_s3_helper = S3Helper.new(s3_bucket_name_with_legacy_prefix, '', @s3_options.clone)
legacy_keys = legacy_s3_helper.list.map { |o| o.key }
legacy_keys.each do |legacy_key|
bucket, prefix = s3_bucket_name_with_prefix.split('/', 2) bucket, prefix = s3_bucket_name_with_prefix.split('/', 2)
legacy_keys = legacy_s3_helper.list
.reject { |o| o.key.starts_with? prefix }
.map { |o| o.key }
legacy_keys.each do |legacy_key|
@s3_helper.s3_client.copy_object({ @s3_helper.s3_client.copy_object({
copy_source: File.join(bucket, legacy_key), copy_source: File.join(bucket, legacy_key),
bucket: bucket, bucket: bucket,