X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4211e34c99a068e8beb0baa6522c655c35b47b20..b6bc9bbe45a68a07b1ea8139e1f4d698873739a7:/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 831451435e..21c8e4710c 100644
--- a/services/api/app/controllers/database_controller.rb
+++ b/services/api/app/controllers/database_controller.rb
@@ -29,34 +29,49 @@ class DatabaseController < ApplicationController
     fixturesets = Dir.glob(Rails.root.join('test', 'fixtures', '*.yml')).
       collect { |yml| yml.match(/([^\/]*)\.yml$/)[1] }
 
-    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
+    # Don't reset keep_services: clients need to discover our
+    # integration-testing keepstores, not test fixtures.
+    fixturesets -= %w[keep_services]
+
+    table_names = '"' + ActiveRecord::Base.connection.tables.join('","') + '"'
+
+    attempts_left = 20
+    begin
+      ActiveRecord::Base.transaction do
+        # Avoid deadlock by locking all tables before doing anything
+        # drastic.
+        ActiveRecord::Base.connection.execute \
+        "LOCK TABLE #{table_names} IN ACCESS EXCLUSIVE MODE"
 
-      # 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)
+        # Delete existing fixtures (and everything else) from fixture
+        # tables
+        fixturesets.each do |x|
+          x.classify.constantize.unscoped.delete_all
+        end
 
-      # Dump cache of permissions etc.
-      Rails.cache.clear
-      ActiveRecord::Base.connection.clear_query_cache
+        # 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)
 
-      # Reload database seeds
-      DatabaseSeeds.install
+        # Dump cache of permissions etc.
+        Rails.cache.clear
+        ActiveRecord::Base.connection.clear_query_cache
+
+        # Reload database seeds
+        DatabaseSeeds.install
+      end
+    rescue ActiveRecord::StatementInvalid => e
+      if "#{e.inspect}" =~ /deadlock detected/i and (attempts_left -= 1) > 0
+        logger.info "Waiting for lock -- #{e.inspect}"
+        sleep 0.5
+        retry
+      end
+      raise
     end
 
     # Done.
-    render json: {success: true}
+    send_json success: true
   end
 end