diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 16:20:27 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-04-06 16:20:27 +0000 |
commit | 828d81ee1f6aaaf6ab9de1ed0c675ff961831c17 (patch) | |
tree | a8e9ba81f60e1185a86920ace8b9b2e9352e8ce9 /lib/api/runner.rb | |
parent | 514dc1a0848616b93e8910c6c48eea4f64391884 (diff) | |
download | gitlab-ce-828d81ee1f6aaaf6ab9de1ed0c675ff961831c17.tar.gz |
Optimise trace handling code to use streaming instead of full read
Diffstat (limited to 'lib/api/runner.rb')
-rw-r--r-- | lib/api/runner.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index d288369e362..6fbb02cb3aa 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -115,7 +115,7 @@ module API put '/:id' do job = authenticate_job! - job.update_attributes(trace: params[:trace]) if params[:trace] + job.trace.set(params[:trace]) if params[:trace] Gitlab::Metrics.add_event(:update_build, project: job.project.path_with_namespace) @@ -145,16 +145,14 @@ module API content_range = request.headers['Content-Range'] content_range = content_range.split('-') - current_length = job.trace_length - unless current_length == content_range[0].to_i - return error!('416 Range Not Satisfiable', 416, { 'Range' => "0-#{current_length}" }) + stream_size = job.trace.append(request.body.read, content_range[0].to_i) + if stream_size < 0 + return error!('416 Range Not Satisfiable', 416, { 'Range' => "0-#{-stream_size}" }) end - job.append_trace(request.body.read, content_range[0].to_i) - status 202 header 'Job-Status', job.status - header 'Range', "0-#{job.trace_length}" + header 'Range', "0-#{stream_size}" end desc 'Authorize artifacts uploading for job' do |