Fix pages migration deadlock

9da47a7c · Vladimir Shushlin · b1d094be · 9da47a7c
Commit 9da47a7c authored Jan 27, 2021 by Vladimir Shushlin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

app/services/pages/migrate_from_legacy_storage_service.rb app/services/pages/migrate_from_legacy_storage_service.rb +3 -1

No files found.
--- a/app/services/pages/migrate_from_legacy_storage_service.rb
+++ b/app/services/pages/migrate_from_legacy_storage_service.rb
@@ -24,7 +24,9 @@ module Pages
      @queue.close

      @logger.info("Waiting for threads to finish...")
-      threads.each(&:join)
+      ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+        threads.each(&:join)
+      end

      { migrated: @migrated, errored: @errored }
    end