Merge branch 'zj-backup-restore-object-pools' into 'master'

Restore Object Pools when restoring an object pool

Closes gitaly#1355

See merge request gitlab-org/gitlab-ce!23682

1 files changed, 15 insertions, 1 deletions

diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index c8a5377bfa0..184c7418e75 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -4,6 +4,7 @@ require 'yaml'
 
 module Backup
   class Repository
+    include Gitlab::ShellAdapter
     attr_reader :progress
 
     def initialize(progress)
@@ -75,7 +76,6 @@ module Backup
 
     def restore
       prepare_directories
-      gitlab_shell = Gitlab::Shell.new
 
       Project.find_each(batch_size: 1000) do |project|
         progress.print " * #{project.full_path} ... "
@@ -118,6 +118,8 @@ module Backup
           end
         end
       end
+
+      restore_object_pools
     end
 
     protected
@@ -159,5 +161,17 @@ module Backup
     def display_repo_path(project)
       project.hashed_storage?(:repository) ? "#{project.full_path} (#{project.disk_path})" : project.full_path
     end
+
+    def restore_object_pools
+      PoolRepository.includes(:source_project).find_each do |pool|
+        progress.puts " - Object pool #{pool.disk_path}..."
+
+        pool.source_project ||= pool.member_projects.first.root_of_fork_network
+        pool.state = 'none'
+        pool.save
+
+        pool.schedule
+      end
+    end
   end
 end