diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-03-30 14:53:54 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-03-30 14:53:54 +0000 |
| commit | 059aca1a50ab4be9c23e556d7d7d47ee24da6af7 (patch) | |
| tree | 4c224e9d35d67402fafaccdaa00e5ed113e40b05 | |
| parent | 3bfc8761a8cbe834c5db854d24eed83cfb71fcac (diff) | |
| parent | cc82abbde0c8994a64183f4d7250966b3d462b66 (diff) | |
| download | gitlab-ce-059aca1a50ab4be9c23e556d7d7d47ee24da6af7.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 5bf8208e035..9c8877be14e 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -178,6 +178,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 |