Lockdown dalli to 3.0.6 while we address breaking changes in 3.1.0 #21595
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes ManageIQ#21593 Dalli 3.1.0 was released and had the following changes from 3.0.6: petergoldstein/dalli@v3.0.6...v3.1.0 Among these these changes: * destroy_session was renamed to delete_session * with_block is now with_dalli_client This is important because we have monkey patches on these private methods to ensure we can safely load code in threads from within them. When these patches aren't applied, we can get deadlocks. Additionally, request.session_options[:id] is now a Rack::Session::SessionId object that can't be cast in find_by calls so we may need to make this change in user: - sessions << Session.find_or_create_by(:session_id => session_id) + sessions << Session.find_or_create_by(:session_id => session_id.private_id) Related to https://github.com/rails/activerecord-session_store/issues ManageIQ#154 Note, even with local changes to account for the renames and this change in the session_id, some pages were still hung so we'll just lock down to 3.0.6 until we can resolve them.
|
Checked commit jrafanie@b3e4c69 with ruby 2.6.3, rubocop 1.13.0, haml-lint 0.35.0, and yamllint |
|
@jrafanie A conflict occurred during the backport of this pull request to If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the Conflict details: diff --cc Gemfile
index e790e7c7a1,2eb2ab589b..0000000000
--- a/Gemfile
+++ b/Gemfile
@@@ -30,8 -30,10 +30,12 @@@ gem "bcrypt"
gem "bundler", "~> 2.1", ">= 2.1.4", "!= 2.2.10", :require => false
gem "byebug", :require => false
gem "color", "~>1.8"
-gem "connection_pool", :require => false # For Dalli
gem "config", "~>2.2", ">=2.2.3", :require => false
++<<<<<<< HEAD
+gem "dalli", "=2.7.6", :require => false
++=======
+ gem "dalli", "~>3.0.6", :require => false
++>>>>>>> d943a50285... Merge pull request #21595 from jrafanie/lock_down_dalli
gem "default_value_for", "~>3.3"
gem "docker-api", "~>1.33.6", :require => false
gem "elif", "=0.1.0", :require => false |
|
Yeah, then morphy should be fine without it |
|
Yeah, it's not worth it, we'd have to bring back |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #21593
Dalli 3.1.0 was released and had the following changes from 3.0.6:
petergoldstein/dalli@v3.0.6...v3.1.0
Among these these changes:
This is important because we have monkey patches on these private methods to
ensure we can safely load code in threads from within them. When these patches
aren't applied, we can get deadlocks.
Additionally, request.session_options[:id] is now a Rack::Session::SessionId
object that can't be cast in find_by calls so we may need to make this change in
user:
Related to rails/activerecord-session_store#154
Note, even with local changes to account for the renames and this change in the
session_id, some pages were still hung so we'll just lock down to 3.0.6 until we
can resolve them.