diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-15 05:54:19 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-15 05:54:19 +0300 |
| commit | bf4455d14659f1fde6391164b38310d361bf407d (patch) | |
| tree | d4418076964e28b5e29e68e902da21be95c89c5b /app/workers | |
| parent | db6a75c23af7f1dbced6bb088b64215156acdee9 (diff) | |
| parent | e6d66c4d3b8bdaa4abc85f3f35e0b06b785008da (diff) | |
Merge branch 'dont-drop-stuck-builds' into 'master'
Don't fail builds for projects that are deleted when they are stuck
## What does this MR do?
Solves when dropping stuck connection.
```
Dropping stuck pending build 1545510 for runner
NoMethodError: undefined method `origin_merge_requests' for nil:NilClass
from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/base_service.rb:50:in `merge_request_from'
from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/base_service.rb:57:in `each_merge_request'
from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/add_todo_when_build_fails_service.rb:5:in `execute'
from /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/metrics/instrumentation.rb:164:in `execute'
from /opt/gitlab/embedded/service/gitlab-rails/app/models/commit_status.rb:51:in `block (2 levels) in <class:CommitStatus>'
from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/state_machines-0.4.0/lib/state_machines/eval_helpers.rb:79:in `call'
...
```
This happens, because that `default_scope` of `Projects` filters returns the projects that are not deleted, where `Ci::Build` doesn't take into account.
See merge request !4609
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/stuck_ci_builds_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/stuck_ci_builds_worker.rb b/app/workers/stuck_ci_builds_worker.rb index ca594e77e7c..6828013b377 100644 --- a/app/workers/stuck_ci_builds_worker.rb +++ b/app/workers/stuck_ci_builds_worker.rb @@ -6,7 +6,7 @@ class StuckCiBuildsWorker def perform Rails.logger.info 'Cleaning stuck builds' - builds = Ci::Build.running_or_pending.where('updated_at < ?', BUILD_STUCK_TIMEOUT.ago) + builds = Ci::Build.joins(:project).running_or_pending.where('ci_builds.updated_at < ?', BUILD_STUCK_TIMEOUT.ago) builds.find_each(batch_size: 50).each do |build| Rails.logger.debug "Dropping stuck #{build.status} build #{build.id} for runner #{build.runner_id}" build.drop |