Merge branch '4314-trigger-job-update' closes #4314

[arvados.git] / services / api / app / controllers / database_controller.rb

diff --git a/services/api/app/controllers/database_controller.rb b/services/api/app/controllers/database_controller.rb
index a2e15ed1561db247521eb8b65da36cadb08f9853..831451435ef9f9adb47d974cdb91697f9db43f71 100644 (file)
--- a/services/api/app/controllers/database_controller.rb
+++ b/services/api/app/controllers/database_controller.rb
@@ -29,25 +29,33 @@ class DatabaseController < ApplicationController
     fixturesets = Dir.glob(Rails.root.join('test', 'fixtures', '*.yml')).
       collect { |yml| yml.match(/([^\/]*)\.yml$/)[1] }
 
-    # Delete existing fixtures (and everything else) from fixture
-    # tables
-    fixturesets.each do |x|
-      x.classify.constantize.unscoped.delete_all
+    ActiveRecord::Base.transaction do
+      # Avoid deadlock by locking all tables before doing anything
+      # drastic.
+      table_names = '"' + fixturesets.sort.join('","') + '"'
+      ActiveRecord::Base.connection.execute \
+      "LOCK TABLE #{table_names} IN ACCESS EXCLUSIVE MODE"
+
+      # Delete existing fixtures (and everything else) from fixture
+      # tables
+      fixturesets.each do |x|
+        x.classify.constantize.unscoped.delete_all
+      end
+
+      # create_fixtures() is a no-op for cached fixture sets, so
+      # uncache them all.
+      ActiveRecord::Fixtures.reset_cache
+      ActiveRecord::Fixtures.
+        create_fixtures(Rails.root.join('test', 'fixtures'), fixturesets)
+
+      # Dump cache of permissions etc.
+      Rails.cache.clear
+      ActiveRecord::Base.connection.clear_query_cache
+
+      # Reload database seeds
+      DatabaseSeeds.install
     end
 
-    # create_fixtures() is a no-op for cached fixture sets, so uncache
-    # them all.
-    ActiveRecord::Fixtures.reset_cache
-    ActiveRecord::Fixtures.
-      create_fixtures(Rails.root.join('test', 'fixtures'), fixturesets)
-
-    # Dump cache of permissions etc.
-    Rails.cache.clear
-    ActiveRecord::Base.connection.clear_query_cache
-
-    # Reload database seeds
-    DatabaseSeeds.install
-
     # Done.
     render json: {success: true}
   end