From 226c224234d8ac67f22fb162953e7ac905d42ad8 Mon Sep 17 00:00:00 2001 From: Paco Guzman Date: Tue, 26 Jul 2016 10:17:28 +0200 Subject: Rescue Rugged::OSError (lock exists) when creating references. --- CHANGELOG | 1 + app/models/repository.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ef8c72f4aa2..7821ca7b4b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 8.11.0 (unreleased) v 8.10.2 (unreleased) - User can now search branches by name. !5144 - Fix backup restore. !5459 + - Rescue Rugged::OSError (lock exists) when creating references. !5497 - Disable MySQL foreign key checks before dropping all tables. !5472 - Use project ID in repository cache to prevent stale data from persisting across projects. !5460 - Ensure relative paths for video are rewritten as we do for images. !5474 diff --git a/app/models/repository.rb b/app/models/repository.rb index e9d5f4c91f8..d8775ecbd6c 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -211,6 +211,9 @@ class Repository rugged.references.create(keep_around_ref_name(sha), sha, force: true) rescue Rugged::ReferenceError => ex Rails.logger.error "Unable to create 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 keep-around reference for repository #{path}: #{ex}" end end -- cgit v1.2.1