libgit2: always cleanup after opening a repository, this way we don't lock the repo in multi-worker env

vcsserver/git.py

@@ -158,7 +158,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def is_empty(self, wire):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
 
         try:
             has_head = repo.head.name
@@ -174,7 +175,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def add_object(self, wire, content):
-        repo = self._factory.repo(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         blob = objects.Blob()
         blob.set_raw_string(content)
         repo.object_store.add_object(blob)
@@ -183,7 +185,9 b' class GitRemote(object):'
     @reraise_safe_exceptions
     def assert_correct_path(self, wire):
         try:
-            self._factory.repo_libgit2(wire)
+            repo_init = self._factory.repo_libgit2(wire)
+            with repo_init as repo:
+                pass
         except pygit2.GitError:
             path = wire.get('path')
             tb = traceback.format_exc()
@@ -194,7 +198,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def bare(self, wire):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         return repo.is_bare
 
     @reraise_safe_exceptions
@@ -232,7 +237,6 b' class GitRemote(object):'
     @reraise_safe_exceptions
     def is_large_file(self, wire, sha):
         repo_init = self._factory.repo_libgit2(wire)
-
         with repo_init as repo:
             blob = repo[sha]
             if blob.is_binary:
@@ -242,12 +246,14 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def in_largefiles_store(self, wire, oid):
-        repo = self._factory.repo_libgit2(wire)
         conf = self._wire_to_config(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
+            repo_name = repo.path
 
         store_location = conf.get('vcs_git_lfs_store_location')
         if store_location:
-            repo_name = repo.path
+
             store = LFSOidStore(
                 oid=oid, repo=repo_name, store_location=store_location)
             return store.has_oid()
@@ -256,12 +262,13 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def store_path(self, wire, oid):
-        repo = self._factory.repo_libgit2(wire)
         conf = self._wire_to_config(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
+            repo_name = repo.path
 
         store_location = conf.get('vcs_git_lfs_store_location')
         if store_location:
-            repo_name = repo.path
             store = LFSOidStore(
                 oid=oid, repo=repo_name, store_location=store_location)
             return store.oid_path
@@ -605,7 +612,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def get_object(self, wire, sha):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
 
         missing_commit_err = 'Commit {} does not exist for `{}`'.format(sha, wire['path'])
         try:
@@ -633,8 +641,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def get_refs(self, wire):
-        repo = self._factory.repo_libgit2(wire)
-
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         result = {}
         for ref in repo.references:
             peeled_sha = repo.lookup_reference(ref).peel()
@@ -644,7 +652,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def head(self, wire, show_exc=True):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         try:
             return repo.head.peel().hex
         except Exception:
@@ -663,7 +672,8 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def revision(self, wire, rev):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         commit = repo[rev]
         obj_data = {
             'id': commit.id.hex,
@@ -676,14 +686,16 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def date(self, wire, rev):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         commit = repo[rev]
         # TODO(marcink): check dulwich difference of offset vs timezone
         return [commit.commit_time, commit.commit_time_offset]
 
     @reraise_safe_exceptions
     def author(self, wire, rev):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         commit = repo[rev]
         if commit.author.email:
             return u"{} <{}>".format(commit.author.name, commit.author.email)
@@ -692,24 +704,28 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def message(self, wire, rev):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         commit = repo[rev]
         return commit.message
 
     @reraise_safe_exceptions
     def parents(self, wire, rev):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         commit = repo[rev]
         return [x.hex for x in commit.parent_ids]
 
     @reraise_safe_exceptions
     def set_refs(self, wire, key, value):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         repo.references.create(key, value, force=True)
 
     @reraise_safe_exceptions
     def create_branch(self, wire, branch_name, commit_id, force=False):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         commit = repo[commit_id]
 
         if force:
@@ -720,12 +736,14 b' class GitRemote(object):'
 
     @reraise_safe_exceptions
     def remove_ref(self, wire, key):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         repo.references.delete(key)
 
     @reraise_safe_exceptions
     def tag_remove(self, wire, tag_name):
-        repo = self._factory.repo_libgit2(wire)
+        repo_init = self._factory.repo_libgit2(wire)
+        with repo_init as repo:
         key = 'refs/tags/{}'.format(tag_name)
         repo.references.delete(key)