Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-06-01 11:09:46 +0300
committerShinya Maeda <shinya@gitlab.com>2018-06-06 11:49:48 +0300
commit2084e7ab9aad92d4a8196af01b9b8e02ffacb0a4 (patch)
treeced2cd19a96d56f6092fae5399dde9d543437561 /app/models/ci
parent4064481501a24d31872914c845f5d8c2cfc08040 (diff)
Move find_builds_from_stale_live_traces method to Ci::Build
Diffstat (limited to 'app/models/ci')
-rw-r--r--app/models/ci/build.rb15
-rw-r--r--app/models/ci/build_trace_chunk.rb15
2 files changed, 15 insertions, 15 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index d93e7cb896f..f8fcab0e2f0 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -583,6 +583,21 @@ module Ci
super(options).merge(when: read_attribute(:when))
end
+ # Find stale live traces and return their build ids
+ def self.find_builds_from_stale_live_traces
+ binding.pry
+
+ Ci::BuildTraceChunk
+ .include(EachBatch).select(:build_id).group(:build_id).joins(:build)
+ .merge(Ci::Build.finished).where('ci_builds.finished_at < ?', 1.hour.ago)
+ .each_batch(column: :build_id) do |chunks|
+ build_ids = chunks.map { |chunk| chunk.build_id }
+
+ binding.pry
+ yield where(id: build_ids)
+ end
+ end
+
private
def update_artifacts_size
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb
index 80a63434283..4856f10846c 100644
--- a/app/models/ci/build_trace_chunk.rb
+++ b/app/models/ci/build_trace_chunk.rb
@@ -50,21 +50,6 @@ module Ci
def finalize_fast_destroy(keys)
redis_delete_data(keys)
end
-
- # Find stale live traces and return their build ids
- def find_builds_from_stale_live_trace
- include(EachBatch)
- .select(:build_id)
- .group(:build_id)
- .joins(:build)
- .merge(Ci::Build.finished)
- .where('ci_builds.finished_at < ?', 1.hour.ago)
- .each_batch(column: :build_id) do |chunks|
- build_ids = chunks.map { |chunk| chunk.build_id }
-
- yield build_ids
- end
- end
end
##