diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/services/ci/update_build_state_service.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/services/ci/update_build_state_service.rb')
| -rw-r--r-- | app/services/ci/update_build_state_service.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/services/ci/update_build_state_service.rb b/app/services/ci/update_build_state_service.rb index 22a27906700..fb67b0d2355 100644 --- a/app/services/ci/update_build_state_service.rb +++ b/app/services/ci/update_build_state_service.rb @@ -163,16 +163,18 @@ module Ci end def ensure_pending_state - Ci::BuildPendingState.create_or_find_by!( + build_state = Ci::BuildPendingState.safe_find_or_create_by( build_id: build.id, state: params.fetch(:state), trace_checksum: params.fetch(:checksum), failure_reason: params.dig(:failure_reason) ) - rescue ActiveRecord::RecordNotFound - metrics.increment_trace_operation(operation: :conflict) - build.pending_state + unless build_state.present? + metrics.increment_trace_operation(operation: :conflict) + end + + build_state || build.pending_state end ## |