Fix recurring state execution not using correct order

Signed-off-by: Pascal Arlt <parlt@suse.com>
uyuni-project · Sep 8, 2023 · 5116709 · 5116709
1 parent 6f5e209
commit 5116709
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RecurringActionJob.java b/java/code/src/com/redhat/rhn/taskomatic/task/RecurringActionJob.java
@@ -32,6 +32,7 @@
 
 import org.quartz.JobExecutionContext;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -86,7 +87,9 @@ private void scheduleAction(JobExecutionContext context, RecurringAction action)
             }
             else if (actionType instanceof RecurringState) {
                 Set<RecurringStateConfig> configs = ((RecurringState) action.getRecurringActionType()).getStateConfig();
-                List<String> mods = configs.stream().map(RecurringStateConfig::getStateName)
+                List<String> mods = configs.stream()
+                        .sorted(Comparator.comparingLong(RecurringStateConfig::getPosition))
+                        .map(RecurringStateConfig::getStateName)
                         .collect(Collectors.toList());
                 Action a = ActionManager.scheduleApplyStates(action.getCreator(),
                         minionIds, mods,

diff --git a/java/spacewalk-java.changes.parlt.fix-recurring-state-ordering b/java/spacewalk-java.changes.parlt.fix-recurring-state-ordering
@@ -0,0 +1 @@
+- Fix recurring state execution not using the correct order (bsc#1215027)