From d62ee8f9993512f26a405e7ac4431815b4230beb Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 9 Oct 2015 12:31:30 -0700 Subject: [PATCH 1/3] Fix thread leak, fixes #2598 --- lib/sidekiq/manager.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sidekiq/manager.rb b/lib/sidekiq/manager.rb index a73f04036..822cd23d4 100644 --- a/lib/sidekiq/manager.rb +++ b/lib/sidekiq/manager.rb @@ -132,7 +132,7 @@ def assign(work) # get handle to the underlying thread performing work for a processor # so we have it call us and tell us. def real_thread(proxy_id, thr) - @threads[proxy_id] = thr + @threads[proxy_id] = thr if thr.alive? end PROCTITLES = [ From 069971a0d0f8ec2a64f96517207774d3b4ee8ef5 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 9 Oct 2015 12:37:05 -0700 Subject: [PATCH 2/3] Prepare for release --- Changes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index f09d2bc3b..958b29155 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,7 @@ -HEAD +3.5.1 ----------- +- **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598] - Add Ukranian locale [#2561, elrakita] - Disconnect and retry Redis operations if we see a READONLY error [#2550] - Add server middleware testing harness; see [wiki](https://github.com/mperham/sidekiq/wiki/Testing#testing-server-middleware) [#2534, ryansch] From 9732de484307f5453e8b2ae889fce4c5debf0321 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 9 Oct 2015 13:28:40 -0700 Subject: [PATCH 3/3] Give credit, #2598 --- Changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 958b29155..154752ac3 100644 --- a/Changes.md +++ b/Changes.md @@ -1,7 +1,7 @@ 3.5.1 ----------- -- **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598] +- **FIX MEMORY LEAK** Under rare conditions, threads may leak [#2598, gazay] - Add Ukranian locale [#2561, elrakita] - Disconnect and retry Redis operations if we see a READONLY error [#2550] - Add server middleware testing harness; see [wiki](https://github.com/mperham/sidekiq/wiki/Testing#testing-server-middleware) [#2534, ryansch]