diff options
| -rw-r--r-- | changelogs/unreleased/rails5-gpg-permit-concurrent.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/gpg.rb | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/changelogs/unreleased/rails5-gpg-permit-concurrent.yml b/changelogs/unreleased/rails5-gpg-permit-concurrent.yml new file mode 100644 index 00000000000..cf1b0023f86 --- /dev/null +++ b/changelogs/unreleased/rails5-gpg-permit-concurrent.yml @@ -0,0 +1,5 @@ +--- +title: Permit concurrent loads in gpg keychain mutex +merge_request: 20894 +author: Jasper Maes +type: fixed diff --git a/lib/gitlab/gpg.rb b/lib/gitlab/gpg.rb index a4263369269..8a91e034377 100644 --- a/lib/gitlab/gpg.rb +++ b/lib/gitlab/gpg.rb @@ -71,8 +71,16 @@ module Gitlab if MUTEX.locked? && MUTEX.owned? optimistic_using_tmp_keychain(&block) else - MUTEX.synchronize do - optimistic_using_tmp_keychain(&block) + if Gitlab.rails5? + ActiveSupport::Dependencies.interlock.permit_concurrent_loads do + MUTEX.synchronize do + optimistic_using_tmp_keychain(&block) + end + end + else + MUTEX.synchronize do + optimistic_using_tmp_keychain(&block) + end end end end |