1 files changed, 1 insertions, 17 deletions
diff --git a/lib/gitlab/github_import/parallel_importer.rb b/lib/gitlab/github_import/parallel_importer.rb
index 9d81441d96e..1d3541b80c7 100644
--- a/lib/gitlab/github_import/parallel_importer.rb
+++ b/lib/gitlab/github_import/parallel_importer.rb
@@ -29,29 +29,13 @@ module Gitlab
       end
 
       def execute
-        jid = generate_jid
-
-        # The original import JID is the JID of the RepositoryImportWorker job,
-        # which will be removed once that job completes. Reusing that JID could
-        # result in StuckImportJobsWorker marking the job as stuck before we get
-        # to running Stage::ImportRepositoryWorker.
-        #
-        # We work around this by setting the JID to a custom generated one, then
-        # refreshing it in the various stages whenever necessary.
-        Gitlab::SidekiqStatus
-          .set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
-
-        project.import_state.update_column(:jid, jid)
+        Gitlab::Import::SetAsyncJid.set_jid(project)
 
         Stage::ImportRepositoryWorker
           .perform_async(project.id)
 
         true
       end
-
-      def generate_jid
-        "github-importer/#{project.id}"
-      end
     end
   end
 end