From fb6f7075558c31c716a4628804a35d347aed18b4 Mon Sep 17 00:00:00 2001
From: Markus Bucher <bucher@atix.de>
Date: Fri, 27 Oct 2023 14:31:22 +0200
Subject: [PATCH] Fixes #36871 - Fix incremental update concurrency

Do not run Incremental Updates on the same Content View in parallel
---
 .../content_view/incremental_updates.rb       | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/lib/actions/katello/content_view/incremental_updates.rb b/app/lib/actions/katello/content_view/incremental_updates.rb
index 50400b5027e..92c642e865b 100644
--- a/app/lib/actions/katello/content_view/incremental_updates.rb
+++ b/app/lib/actions/katello/content_view/incremental_updates.rb
@@ -4,28 +4,41 @@ module ContentView
       class IncrementalUpdates < Actions::EntryAction
         include Helpers::Presenter
 
+        def version_environments_by_cv_id(version_environments)
+          by_content_view = {}
+          version_environments.each do |version_environment|
+            by_content_view[version_environment[:content_view_version].content_view.id] ||= []
+            by_content_view[version_environment[:content_view_version].content_view.id] << version_environment
+          end
+          by_content_view
+        end
+
         def plan(version_environments, composite_version_environments, content, dep_solve, hosts, description)
           old_new_version_map = {}
           output_for_version_ids = []
 
           sequence do
             concurrence do
-              version_environments.each do |version_environment|
-                version = version_environment[:content_view_version]
-                if version.content_view.generated?
-                  fail _("Cannot perform an incremental update on a Generated Content View Version (%{name} version version %{version}") %
-                    {:name => version.content_view.name, :version => version.version}
+              version_environments_by_cv_id(version_environments).each_value do |version_environments_for_cv|
+                sequence do
+                  version_environments_for_cv.each do |version_environment|
+                    version = version_environment[:content_view_version]
+                    if version.content_view.generated?
+                      fail _("Cannot perform an incremental update on a Generated Content View Version (%{name} version version %{version}") %
+                        {:name => version.content_view.name, :version => version.version}
+                    end
+
+                    if version.content_view.composite?
+                      fail _("Cannot perform an incremental update on a Composite Content View Version (%{name} version version %{version}") %
+                        {:name => version.content_view.name, :version => version.version}
+                    end
+
+                    action = plan_action(ContentViewVersion::IncrementalUpdate, version,
+                                         version_environment[:environments], :resolve_dependencies => dep_solve, :content => content, :description => description)
+                    old_new_version_map[version] = action.new_content_view_version
+                    output_for_version_ids << {:version_id => action.new_content_view_version.id, :output => action.output}
+                  end
                 end
-
-                if version.content_view.composite?
-                  fail _("Cannot perform an incremental update on a Composite Content View Version (%{name} version version %{version}") %
-                    {:name => version.content_view.name, :version => version.version}
-                end
-
-                action = plan_action(ContentViewVersion::IncrementalUpdate, version,
-                            version_environment[:environments], :resolve_dependencies => dep_solve, :content => content, :description => description)
-                old_new_version_map[version] = action.new_content_view_version
-                output_for_version_ids << {:version_id => action.new_content_view_version.id, :output => action.output}
               end
             end