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

Merge branch 'sh-cleanup-pages-worker' into 'master'
3df0d0a5 · Nick Thomas · Filipa Lacerda · 31bb6773 · 3df0d0a5 · 3df0d0a5
Commit 3df0d0a5 authored Mar 30, 2018 by Nick Thomas Committed by Filipa Lacerda Apr 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

update_pages_service.rb app/services/projects/update_pages_service.rb +3 -0

sh-cleanup-pages-worker.yml changelogs/unreleased/sh-cleanup-pages-worker.yml +5 -0

No files found.
--- 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

--- a/changelogs/unreleased/sh-cleanup-pages-worker.yml
+++ b/changelogs/unreleased/sh-cleanup-pages-worker.yml
+---
+title: Free open file descriptors and libgit2 buffers in UpdatePagesService
+merge_request:
+author:
+type: performance