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

Merge branch 'check-import-job-status' into 'master'
66e6052b · Robert Speicher · 2c9894d4 · c162e027 · 66e6052b
Commit 66e6052b authored Apr 12, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

project.rb app/models/project.rb +8 -2

No files found.
--- 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