Merge branch 'move-worker-differences' into 'master'

Refactor Sidekiq workers to reduce differences between CE and EE

See merge request gitlab-org/gitlab-ce!24466

2 files changed, 39 insertions, 15 deletions

diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb
index 61d866b1f02..ae853ec9316 100644
--- a/app/workers/build_finished_worker.rb
+++ b/app/workers/build_finished_worker.rb
@@ -9,14 +9,26 @@ class BuildFinishedWorker
   # rubocop: disable CodeReuse/ActiveRecord
   def perform(build_id)
     Ci::Build.find_by(id: build_id).try do |build|
-      # We execute that in sync as this access the files in order to access local file, and reduce IO
-      BuildTraceSectionsWorker.new.perform(build.id)
-      BuildCoverageWorker.new.perform(build.id)
-
-      # We execute that async as this are two independent operations that can be executed after TraceSections and Coverage
-      BuildHooksWorker.perform_async(build.id)
-      ArchiveTraceWorker.perform_async(build.id)
+      process_build(build)
     end
   end
   # rubocop: enable CodeReuse/ActiveRecord
+
+  private
+
+  # Processes a single CI build that has finished.
+  #
+  # This logic resides in a separate method so that EE can extend it more
+  # easily.
+  #
+  # @param [Ci::Build] build The build to process.
+  def process_build(build)
+    # We execute these in sync to reduce IO.
+    BuildTraceSectionsWorker.new.perform(build.id)
+    BuildCoverageWorker.new.perform(build.id)
+
+    # We execute these async as these are independent operations.
+    BuildHooksWorker.perform_async(build.id)
+    ArchiveTraceWorker.perform_async(build.id)
+  end
 end
diff --git a/app/workers/expire_pipeline_cache_worker.rb b/app/workers/expire_pipeline_cache_worker.rb
index c96e8a0379b..148384600b6 100644
--- a/app/workers/expire_pipeline_cache_worker.rb
+++ b/app/workers/expire_pipeline_cache_worker.rb
@@ -11,16 +11,9 @@ class ExpirePipelineCacheWorker
     pipeline = Ci::Pipeline.find_by(id: pipeline_id)
     return unless pipeline
 
-    project = pipeline.project
     store = Gitlab::EtagCaching::Store.new
 
-    store.touch(project_pipelines_path(project))
-    store.touch(project_pipeline_path(project, pipeline))
-    store.touch(commit_pipelines_path(project, pipeline.commit)) unless pipeline.commit.nil?
-    store.touch(new_merge_request_pipelines_path(project))
-    each_pipelines_merge_request_path(project, pipeline) do |path|
-      store.touch(path)
-    end
+    update_etag_cache(pipeline, store)
 
     Gitlab::Cache::Ci::ProjectPipelineStatus.update_for_pipeline(pipeline)
   end
@@ -51,4 +44,23 @@ class ExpirePipelineCacheWorker
       yield(path)
     end
   end
+
+  # Updates ETag caches of a pipeline.
+  #
+  # This logic resides in a separate method so that EE can more easily extend
+  # it.
+  #
+  # @param [Ci::Pipeline] pipeline
+  # @param [Gitlab::EtagCaching::Store] store
+  def update_etag_cache(pipeline, store)
+    project = pipeline.project
+
+    store.touch(project_pipelines_path(project))
+    store.touch(project_pipeline_path(project, pipeline))
+    store.touch(commit_pipelines_path(project, pipeline.commit)) unless pipeline.commit.nil?
+    store.touch(new_merge_request_pipelines_path(project))
+    each_pipelines_merge_request_path(project, pipeline) do |path|
+      store.touch(path)
+    end
+  end
 end