From 2c6fe72265d250e47c03f27dc274b59d3e7e93f5 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 8 Jul 2016 11:00:30 +0200
Subject: [PATCH] fix thread join issue
---
db/migrate/20160620110927_fix_no_validatable_import_url.rb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/db/migrate/20160620110927_fix_no_validatable_import_url.rb b/db/migrate/20160620110927_fix_no_validatable_import_url.rb
index 02ff1962e3fe1..a3f5073d5117b 100644
--- a/db/migrate/20160620110927_fix_no_validatable_import_url.rb
+++ b/db/migrate/20160620110927_fix_no_validatable_import_url.rb
@@ -68,7 +68,6 @@ def up
end
def process_invalid_import_urls
- @threads = []
batches = SqlBatches.new(query: "SELECT id, import_url FROM projects WHERE import_url IS NOT NULL")
while batches.next?
@@ -81,17 +80,16 @@ def process_invalid_import_urls
process_batch(project_ids)
end
- @threads.each(&:join)
end
def process_batch(project_ids)
- @threads << Thread.new do
+ Thread.new do
begin
project_ids.each { |project_id| cleanup_import_url(project_id) }
ensure
ActiveRecord::Base.connection.close
end
- end
+ end.join
end
def valid_url?(url)
--
GitLab