Commit 7c40e463 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch '4638-master-failure-in-spec-ee-spec-lib-gitlab-geo-log_cursor-daemon_spec-rb' into 'master'

Resolve "`master` failure in spec/ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb"

Closes #4638

See merge request gitlab-org/gitlab-ee!4144
parents cf0bdf3a 8d2ede50
...@@ -220,7 +220,7 @@ module Gitlab ...@@ -220,7 +220,7 @@ module Gitlab
file_registry_job_artifacts = ::Geo::FileRegistry.job_artifacts.where(file_id: event.job_artifact_id) file_registry_job_artifacts = ::Geo::FileRegistry.job_artifacts.where(file_id: event.job_artifact_id)
return unless file_registry_job_artifacts.any? # avoid race condition return unless file_registry_job_artifacts.any? # avoid race condition
file_path = File.join(JobArtifactUploader.local_store_path, event.file_path) file_path = File.join(::JobArtifactUploader.local_store_path, event.file_path)
if File.file?(file_path) if File.file?(file_path)
deleted = delete_file(file_path) # delete synchronously to ensure consistency deleted = delete_file(file_path) # delete synchronously to ensure consistency
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment