summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-11-27 09:33:13 -0800
committerMichael Kozono <mkozono@gmail.com>2017-12-01 15:26:42 -0800
commitca817816801c26847b66d105d07fd4473b015b31 (patch)
treeaa9b20a31ba7f3fd9f52353a9bfd493af887b71c
parent71d27044189bf114904e798017e541697acad8e9 (diff)
downloadgitlab-ce-ca817816801c26847b66d105d07fd4473b015b31.tar.gz
Handle race condition
-rw-r--r--lib/gitlab/background_migration/populate_untracked_uploads.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration/populate_untracked_uploads.rb b/lib/gitlab/background_migration/populate_untracked_uploads.rb
index 802b661886b..ebb483c3cff 100644
--- a/lib/gitlab/background_migration/populate_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/populate_untracked_uploads.rb
@@ -229,7 +229,8 @@ module Gitlab
def drop_temp_table_if_finished
if UntrackedFile.all.empty?
- UntrackedFile.connection.drop_table(:untracked_files_for_uploads)
+ UntrackedFile.connection.drop_table(:untracked_files_for_uploads,
+ if_exists: true)
end
end
end