diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-03-18 17:46:44 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-03-18 17:46:44 +0300 |
| commit | c94160b9e9e52455a00ad0ab9911bffc0a832d90 (patch) | |
| tree | 3f9f6b7349ca4bf942bc50f5ffc695fa88b474b7 /lib | |
| parent | 142c39aee6e0e3fb8e73d6eb818e49ef7795cfc4 (diff) | |
| parent | 523712d116a560f314cf144edbde076d7ab6fdc4 (diff) | |
Merge branch '58739-fix-storage-migration' into 'master'
Fix storage migration check for non-empty queues
Closes #58739
See merge request gitlab-org/gitlab-ce!26109
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/hashed_storage/migrator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/hashed_storage/migrator.rb b/lib/gitlab/hashed_storage/migrator.rb index f5368d41629..1f0deebea39 100644 --- a/lib/gitlab/hashed_storage/migrator.rb +++ b/lib/gitlab/hashed_storage/migrator.rb @@ -97,7 +97,7 @@ module Gitlab def any_non_empty_queue?(*workers) workers.any? do |worker| - worker.jobs.any? + !Sidekiq::Queue.new(worker.queue).size.zero? end end |