Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MORPHY] upgrade puma 6.0 #23295

Open
wants to merge 1 commit into
base: morphy
Choose a base branch
from
+3 −3
Open

[MORPHY] upgrade puma 6.0 #23295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ group :v2v, :ui_dependencies do
end

group :web_server, :manageiq_default do
gem "puma", "~>4.2"
gem "puma", "~>6.4"
gem "responders", "~>3.0"
gem "ruby-dbus" # For external auth
gem "secure_headers", "~>3.9"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock.release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ GEM
faraday (>= 0.9, < 2.0.0)
psych (3.3.2)
public_suffix (4.0.6)
puma (4.3.10)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My only question is can you revisit the config/puma.rb and see if there were any changes in threads that might affect our current value and if there are any other settings added/changed that we might want to look at. Note, the comment there is from 3.0.0 puma.

It's fine if it's a followup PR but it's worth revisiting those when we upgrade to see if anything needs to change. For example, if the default is the same as our setting, we can probably drop threads(5, 5) from our configuration.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jrafanie config/puma.rb on morphy is the same as on master.
I did not find any changes that we would need.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this affect us setting min and max thread from configuration file?

We've removed the following public methods on Puma::Server: Puma::Server#min_threads, Puma::Server#max_threads. Instead, you can pass in configuration as an option to Puma::Server#new. This might make certain gems break (capybara for example).

puma (6.5.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If 6.5 is out anyway, should we just change the Gemfile to ~> 6.5 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt that upgarding to a known (in our app) version of puma was the most prudent.
But I guess we can look into upgrading further?

nio4r (~> 2.0)
qpid_proton (0.30.0)
query_relation (0.1.1)
Expand Down Expand Up @@ -1241,7 +1241,7 @@ DEPENDENCIES
pg-dsn_parser (~> 0.1.0)
pg-logical_replication (~> 1.2)
psych (~> 3.1)
puma (~> 4.2)
puma (~> 6.4)
qpid_proton (~> 0.30.0)
query_relation (~> 0.1.0)
rack-attack (~> 6.5.0)
Expand Down