diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-14 14:48:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-14 14:48:30 +0000 |
| commit | 75c3dc9efcc88b8cc9a3d1013fbb5358bb64b432 (patch) | |
| tree | 63bf8c225ed3a58403eadbc986157bbd78f5f426 | |
| parent | 66f0c279714b35215ca4db17742e25bb69079d77 (diff) | |
| parent | c10f61802be9d9059b64386cca6bfc3b07beb0b1 (diff) | |
| download | gitlab-ce-75c3dc9efcc88b8cc9a3d1013fbb5358bb64b432.tar.gz | |
Merge branch 'sidekiq_gc_start' into 'master'
Run 'GC.start' after every EmailsOnPushWorker job
This change removed a lot of large peaks of the Sidekiq memory growth graph on gitlab.com.
See merge request !1257
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d27ec2bbe29..dca9fd74728 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ v 7.5.0 - API: Add support for Hipchat (Kevin Houdebert) - Add time zone configuration on gitlab.yml (Sullivan Senechal) - Fix LDAP authentication for Git HTTP access + - Run 'GC.start' after every EmailsOnPushWorker job - Fix LDAP config lookup for provider 'ldap' - Drop all sequences during Postgres database restore - Project title links to project homepage (Ben Bodenmiller) diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index 2947c8e3ecd..e3f6f3a6aef 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/app/workers/emails_on_push_worker.rb @@ -21,5 +21,8 @@ class EmailsOnPushWorker recipients.split(" ").each do |recipient| Notify.repository_push_email(project_id, recipient, author_id, branch, compare).deliver end + ensure + compare = nil + GC.start end end |