diff options
author | Robert Speicher <robert@gitlab.com> | 2016-04-12 18:07:33 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-04-12 18:07:33 +0000 |
commit | 66e6052b93cf588bb04633fde9fb99097e2cf60d (patch) | |
tree | 36ec9ccc5f951bf0536773c5b1badac08215dab1 | |
parent | 2c9894d457cac2f15331081a4f6974e0803fead3 (diff) | |
parent | c162e0278cb845f6209e926d49474926b6a45956 (diff) | |
download | gitlab-ce-66e6052b93cf588bb04633fde9fb99097e2cf60d.tar.gz |
Merge branch 'check-import-job-status' into 'master'
Check and report import job status to help diagnose issues with forking
There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs.
See merge request !3672
-rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index c3d42705902..fadc8bb2c9e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -389,9 +389,15 @@ class Project < ActiveRecord::Base def add_import_job if forked? - RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path) + job_id = RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path) else - RepositoryImportWorker.perform_async(self.id) + job_id = RepositoryImportWorker.perform_async(self.id) + end + + if job_id + Rails.logger.info "Import job started for #{path_with_namespace} with job ID #{job_id}" + else + Rails.logger.error "Import job failed to start for #{path_with_namespace}" end end |