summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-14 15:40:51 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-14 15:40:51 +0200
commit01c55ffca84aaf2fc957266074ca97183bdaf36a (patch)
tree26e500fce719c2f07aff2f86358b178a0421b94c /lib
parent39b96f02dca3d6edac40b94bf003e6735c4c2524 (diff)
downloadgitlab-ce-01c55ffca84aaf2fc957266074ca97183bdaf36a.tar.gz
Catch exceptions when stealing background migrations
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/background_migration.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb
index 73d2611e51f..64ddae12f89 100644
--- a/lib/gitlab/background_migration.rb
+++ b/lib/gitlab/background_migration.rb
@@ -19,7 +19,12 @@ module Gitlab
next unless job.queue == self.queue
next unless migration_class == steal_class
- perform(migration_class, migration_args) if job.delete
+ begin
+ perform(migration_class, migration_args) if job.delete
+ rescue => e
+ Logger.new($stdout).warn(e.message)
+ next
+ end
end
end
end