Skip to content

Commit

Permalink
Dont warn on empty memory policies, fixes #5712
Browse files Browse the repository at this point in the history
  • Loading branch information
mperham committed Jan 10, 2023
1 parent b774408 commit 4fd6437
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

[Sidekiq Changes](https://github.com/mperham/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/main/Ent-Changes.md)

HEAD
7.0.3
----------

- Don't warn about memory policy on Redis Enterprise [#5712]
- Don't allow Quiet/Stop on embedded Sidekiq instances [#5716]
- Fix `size: X` for configuring the default Redis pool size [#5702]
- Improve the display of queue weights on Busy page [#5642]
Expand Down
2 changes: 1 addition & 1 deletion Ent-Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ HEAD
---------

- Allow user to define the context used to calculate unique locks, see the Unique Jobs wiki page [#5544]
- Provide a little smart connection pool sizing for rate limiters [#5685]
- Smarter connection pool sizing for rate limiters [#5685]

7.0.2
---------
Expand Down
3 changes: 2 additions & 1 deletion lib/sidekiq/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def run(boot_app: true)
raise "You are connecting to Redis #{ver}, Sidekiq requires Redis 6.2.0 or greater" if ver < Gem::Version.new("6.2.0")

maxmemory_policy = info["maxmemory_policy"]
if maxmemory_policy != "noeviction"
if maxmemory_policy != "noeviction" && maxmemory_policy != ""
# Redis Enterprise Cloud returns "" for their policy 😳
logger.warn <<~EOM
Expand Down

0 comments on commit 4fd6437

Please sign in to comment.