Commit e15ed58d authored by Grzegorz Bizon's avatar Grzegorz Bizon Committed by Robert Speicher

Merge branch 'fix/missing-ci-build-traces' into 'master'

Hotfix for builds trace data integrity

Closes #4246

See merge request !2224
parent 1211734e
...@@ -183,8 +183,11 @@ module Ci ...@@ -183,8 +183,11 @@ module Ci
end end
def raw_trace def raw_trace
if File.exist?(path_to_trace) if File.file?(path_to_trace)
File.read(path_to_trace) File.read(path_to_trace)
elsif project.ci_id && File.file?(old_path_to_trace)
# Temporary fix for build trace data integrity
File.read(old_path_to_trace)
else else
# backward compatibility # backward compatibility
read_attribute :trace read_attribute :trace
...@@ -201,8 +204,8 @@ module Ci ...@@ -201,8 +204,8 @@ module Ci
end end
def trace=(trace) def trace=(trace)
unless Dir.exists? dir_to_trace unless Dir.exists?(dir_to_trace)
FileUtils.mkdir_p dir_to_trace FileUtils.mkdir_p(dir_to_trace)
end end
File.write(path_to_trace, trace) File.write(path_to_trace, trace)
...@@ -220,6 +223,55 @@ module Ci ...@@ -220,6 +223,55 @@ module Ci
"#{dir_to_trace}/#{id}.log" "#{dir_to_trace}/#{id}.log"
end end
##
# Deprecated
#
# This is a hotfix for CI build data integrity, see #4246
# Should be removed in 8.4, after CI files migration has been done.
#
def old_dir_to_trace
File.join(
Settings.gitlab_ci.builds_path,
created_at.utc.strftime("%Y_%m"),
project.ci_id.to_s
)
end
##
# Deprecated
#
# This is a hotfix for CI build data integrity, see #4246
# Should be removed in 8.4, after CI files migration has been done.
#
def old_path_to_trace
"#{old_dir_to_trace}/#{id}.log"
end
##
# Deprecated
#
# This contains a hotfix for CI build data integrity, see #4246
#
# This method is used by `ArtifactUploader` to create a store_dir.
# Warning: Uploader uses it after AND before file has been stored.
#
# This method returns old path to artifacts only if it already exists.
#
def artifacts_path
old = File.join(created_at.utc.strftime('%Y_%m'),
project.ci_id.to_s,
id.to_s)
old_store = File.join(ArtifactUploader.artifacts_path, old)
return old if project.ci_id && File.directory?(old_store)
File.join(
created_at.utc.strftime('%Y_%m'),
project.id.to_s,
id.to_s
)
end
def token def token
project.runners_token project.runners_token
end end
......
...@@ -20,16 +20,12 @@ class ArtifactUploader < CarrierWave::Uploader::Base ...@@ -20,16 +20,12 @@ class ArtifactUploader < CarrierWave::Uploader::Base
@build, @field = build, field @build, @field = build, field
end end
def artifacts_path
File.join(build.created_at.utc.strftime('%Y_%m'), build.project.id.to_s, build.id.to_s)
end
def store_dir def store_dir
File.join(ArtifactUploader.artifacts_path, artifacts_path) File.join(self.class.artifacts_path, @build.artifacts_path)
end end
def cache_dir def cache_dir
File.join(ArtifactUploader.artifacts_cache_path, artifacts_path) File.join(self.class.artifacts_cache_path, @build.artifacts_path)
end end
def file_storage? def file_storage?
......
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