diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-03-30 14:53:54 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-09 10:21:13 +0100 |
| commit | 3df0d0a5e35464c5feaef4be0d8b53d711e7461b (patch) | |
| tree | 3103298d9329b70fd7eb9a8d48397d61ce0d1b26 | |
| parent | 31bb6773883f2daccf71c618c6d2c67f19223221 (diff) | |
| download | gitlab-ce-3df0d0a5e35464c5feaef4be0d8b53d711e7461b.tar.gz | |
Merge branch 'sh-cleanup-pages-worker' into 'master'
Free open file descriptors and libgit2 buffers in UpdatePagesService
See merge request gitlab-org/gitlab-ce!18099
| -rw-r--r-- | app/services/projects/update_pages_service.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-cleanup-pages-worker.yml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index 00fdd047208..e1f69997bd4 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -174,6 +174,9 @@ module Projects def latest_sha project.commit(build.ref).try(:sha).to_s + ensure + # Close any file descriptors that were opened and free libgit2 buffers + project.cleanup end def sha diff --git a/changelogs/unreleased/sh-cleanup-pages-worker.yml b/changelogs/unreleased/sh-cleanup-pages-worker.yml new file mode 100644 index 00000000000..c26e1342dd2 --- /dev/null +++ b/changelogs/unreleased/sh-cleanup-pages-worker.yml @@ -0,0 +1,5 @@ +--- +title: Free open file descriptors and libgit2 buffers in UpdatePagesService +merge_request: +author: +type: performance |