X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e65d698ab39cb44cf12630498ac75b475bedec44..54c1afd044ab18db82d897484cae2153bc14a10c:/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 91d98e50f9..21c8e4710c 100644
--- a/services/api/app/controllers/database_controller.rb
+++ b/services/api/app/controllers/database_controller.rb
@@ -5,32 +5,73 @@ class DatabaseController < ApplicationController
   def reset
     raise ArvadosModel::PermissionDeniedError unless Rails.env == 'test'
 
+    # Sanity check: If someone has actually logged in here, this might
+    # not really be a throwaway database. Client test suites should
+    # use @example.com email addresses when creating user records, so
+    # we can tell they're not valuable.
+    user_uuids = User.
+      where('email is null or email not like ?', '%@example.com').
+      collect &:uuid
+    fixture_uuids =
+      YAML::load_file(File.expand_path('../../../test/fixtures/users.yml',
+                                       __FILE__)).
+      values.collect { |u| u['uuid'] }
+    unexpected_uuids = user_uuids - fixture_uuids
+    if unexpected_uuids.any?
+      logger.error("Running in test environment, but non-fixture users exist: " +
+                   "#{unexpected_uuids}")
+      raise ArvadosModel::PermissionDeniedError
+    end
+
     require 'active_record/fixtures'
 
     # What kinds of fixtures do we have?
     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
-    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('","') + '"'
 
-    # 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)
+    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"
 
-    # Dump cache of permissions etc.
-    Rails.cache.clear
-    ActiveRecord::Base.connection.clear_query_cache
+        # Delete existing fixtures (and everything else) from fixture
+        # tables
+        fixturesets.each do |x|
+          x.classify.constantize.unscoped.delete_all
+        end
 
-    # Reload database seeds
-    DatabaseSeeds.install
+        # 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
+    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