Merge branch 'gitaly-write-ref-error-handling' into 'master'

Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref

See merge request gitlab-org/gitlab-ce!16570

1 files changed, 1 insertions, 9 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index b4bc0f87458..73c4899cb9b 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -259,15 +259,7 @@ class Repository
     return if kept_around?(sha)
 
     # This will still fail if the file is corrupted (e.g. 0 bytes)
-    begin
-      raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false)
-    rescue Rugged::ReferenceError => ex
-      Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
-    rescue Rugged::OSError => ex
-      raise unless ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/
-
-      Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
-    end
+    raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false)
   end
 
   def kept_around?(sha)