Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't attempt to migrate multisite test db while holding the mutex (#14298) 

Since you'll have to wait for the mutex to timeout before it can
continue.
This commit is contained in:
Daniel Waterworth 2021-09-09 13:31:52 -05:00 committed by GitHub
parent 3469f7b74f
commit 6262396d8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tasks/db.rake
View File

@ -231,10 +231,10 @@ task 'db:migrate' => ['load_config', 'environment', 'set_locale'] do |_, args|
if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1' if !Discourse.skip_post_deployment_migrations? && ENV['SKIP_OPTIMIZE_ICONS'] != '1'
SiteIconManager.ensure_optimized! SiteIconManager.ensure_optimized!
end end
end
if !Discourse.is_parallel_test? && MultisiteTestHelpers.load_multisite? if !Discourse.is_parallel_test? && MultisiteTestHelpers.load_multisite?
system("RAILS_DB=discourse_test_multisite rake db:migrate") system("RAILS_DB=discourse_test_multisite rake db:migrate")
end
end end
end end