From 481efebe769bdb0c9fbef8e5780b4e992f29e4d2 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 13 Nov 2019 15:52:28 +0000
Subject: [PATCH] DEV: Update backup/restore pipeline to avoid `cd` (#8347)
---
lib/backup_restore/backuper.rb | 73 ++++++++++++++++------------------
lib/backup_restore/restorer.rb | 35 ++++++++--------
2 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 1306d365e7c..0770af2c86f 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -245,12 +245,11 @@ module BackupRestore
Discourse::Utils.execute_command('tar', '--create', '--file', tar_filename, '--files-from', '/dev/null')
log "Archiving data dump..."
- FileUtils.cd(File.dirname(@dump_filename)) do
- Discourse::Utils.execute_command(
- 'tar', '--append', '--dereference', '--file', tar_filename, File.basename(@dump_filename),
- failure_message: "Failed to archive data dump."
- )
- end
+ Discourse::Utils.execute_command(
+ 'tar', '--append', '--dereference', '--file', tar_filename, File.basename(@dump_filename),
+ failure_message: "Failed to archive data dump.",
+ chdir: File.dirname(@dump_filename)
+ )
add_local_uploads_to_archive(tar_filename)
add_remote_uploads_to_archive(tar_filename) if SiteSetting.Upload.enable_s3_uploads
@@ -268,17 +267,16 @@ module BackupRestore
log "Archiving uploads..."
upload_directory = "uploads/" + @current_db
- FileUtils.cd(File.join(Rails.root, "public")) do
- if File.directory?(upload_directory)
- exclude_optimized = SiteSetting.include_thumbnails_in_backups ? '' : "--exclude=#{upload_directory}/optimized"
+ if File.directory?(File.join(Rails.root, "public", upload_directory))
+ exclude_optimized = SiteSetting.include_thumbnails_in_backups ? '' : "--exclude=#{upload_directory}/optimized"
- Discourse::Utils.execute_command(
- 'tar', '--append', '--dereference', exclude_optimized, '--file', tar_filename, upload_directory,
- failure_message: "Failed to archive uploads.", success_status_codes: [0, 1]
- )
- else
- log "No local uploads found. Skipping archiving of local uploads..."
- end
+ Discourse::Utils.execute_command(
+ 'tar', '--append', '--dereference', exclude_optimized, '--file', tar_filename, upload_directory,
+ failure_message: "Failed to archive uploads.", success_status_codes: [0, 1],
+ chdir: File.join(Rails.root, "public")
+ )
+ else
+ log "No local uploads found. Skipping archiving of local uploads..."
end
end
@@ -294,30 +292,29 @@ module BackupRestore
upload_directory = File.join("uploads", @current_db)
count = 0
- FileUtils.cd(@tmp_directory) do
- Upload.find_each do |upload|
- next if upload.local?
- filename = File.join(@tmp_directory, upload_directory, store.get_path_for_upload(upload))
+ Upload.find_each do |upload|
+ next if upload.local?
+ filename = File.join(@tmp_directory, upload_directory, store.get_path_for_upload(upload))
- begin
- FileUtils.mkdir_p(File.dirname(filename))
- store.download_file(upload, filename)
- rescue StandardError => ex
- log "Failed to download file with upload ID #{upload.id} from S3", ex
- end
-
- if File.exists?(filename)
- Discourse::Utils.execute_command(
- 'tar', '--append', '--file', tar_filename, upload_directory,
- failure_message: "Failed to add #{upload.original_filename} to archive.", success_status_codes: [0, 1]
- )
-
- File.delete(filename)
- end
-
- count += 1
- log "#{count} files have already been downloaded. Still downloading..." if count % 500 == 0
+ begin
+ FileUtils.mkdir_p(File.dirname(filename))
+ store.download_file(upload, filename)
+ rescue StandardError => ex
+ log "Failed to download file with upload ID #{upload.id} from S3", ex
end
+
+ if File.exists?(filename)
+ Discourse::Utils.execute_command(
+ 'tar', '--append', '--file', tar_filename, upload_directory,
+ failure_message: "Failed to add #{upload.original_filename} to archive.", success_status_codes: [0, 1],
+ chdir: @tmp_directory
+ )
+
+ File.delete(filename)
+ end
+
+ count += 1
+ log "#{count} files have already been downloaded. Still downloading..." if count % 500 == 0
end
log "No uploads found on S3. Skipping archiving of uploads stored on S3..." if count == 0
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index 98ad91c1c56..c76685c6595 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -432,29 +432,28 @@ module BackupRestore
public_uploads_path = File.join(Rails.root, "public")
- FileUtils.cd(public_uploads_path) do
- FileUtils.mkdir_p("uploads")
+ FileUtils.mkdir_p(File.join(public_uploads_path, "uploads"))
- tmp_uploads_path = Dir.glob(File.join(@tmp_directory, "uploads", "*")).first
- return if tmp_uploads_path.blank?
- previous_db_name = BackupMetadata.value_for("db_name") || File.basename(tmp_uploads_path)
- current_db_name = RailsMultisite::ConnectionManagement.current_db
- optimized_images_exist = File.exist?(File.join(tmp_uploads_path, 'optimized'))
+ tmp_uploads_path = Dir.glob(File.join(@tmp_directory, "uploads", "*")).first
+ return if tmp_uploads_path.blank?
+ previous_db_name = BackupMetadata.value_for("db_name") || File.basename(tmp_uploads_path)
+ current_db_name = RailsMultisite::ConnectionManagement.current_db
+ optimized_images_exist = File.exist?(File.join(tmp_uploads_path, 'optimized'))
- Discourse::Utils.execute_command(
- 'rsync', '-avp', '--safe-links', "#{tmp_uploads_path}/", "uploads/#{current_db_name}/",
- failure_message: "Failed to restore uploads."
- )
+ Discourse::Utils.execute_command(
+ 'rsync', '-avp', '--safe-links', "#{tmp_uploads_path}/", "uploads/#{current_db_name}/",
+ failure_message: "Failed to restore uploads.",
+ chdir: public_uploads_path
+ )
- remap_uploads(previous_db_name, current_db_name)
+ remap_uploads(previous_db_name, current_db_name)
- if SiteSetting.Upload.enable_s3_uploads
- migrate_to_s3
- remove_local_uploads(File.join(public_uploads_path, "uploads/#{current_db_name}"))
- end
-
- generate_optimized_images unless optimized_images_exist
+ if SiteSetting.Upload.enable_s3_uploads
+ migrate_to_s3
+ remove_local_uploads(File.join(public_uploads_path, "uploads/#{current_db_name}"))
end
+
+ generate_optimized_images unless optimized_images_exist
end
def remap_uploads(previous_db_name, current_db_name)