Fix regular states requiring parallel ones

lkubb · dwoz · commit b13ef14179c0 · 2025-05-25T01:46:09.000-07:00
diff --git a/salt/state.py b/salt/state.py
@@ -2688,7 +2688,14 @@ def _check_requisites(self, low: LowChunk, running: dict[str, dict[str, Any]]):
                 if run_dict_chunk:
                     filtered_run_dict[tag] = run_dict_chunk
             run_dict = filtered_run_dict
-            pending = bool(not self.reconcile_procs(run_dict) and low.get("parallel"))
+
+            if low.get("parallel"):
+                pending = not self.reconcile_procs(run_dict)
+            else:
+                while True:
+                    if self.reconcile_procs(run_dict):
+                        break
+                    time.sleep(0.01)
 
             for chunk in chunks:
                 tag = _gen_tag(chunk)
diff --git a/tests/pytests/functional/modules/state/requisites/test_require.py b/tests/pytests/functional/modules/state/requisites/test_require.py
@@ -601,6 +601,41 @@ def test_parallel_state_with_requires_on_parallel(state, state_tree):
             assert "__parallel__" in state_ret
 
 
+@pytest.mark.skip_on_windows
+def test_regular_state_requires_parallel(state, state_tree, tmp_path):
+    """
+    Regular states requiring parallel states should block until all
+    requisites are executed.
+    """
+    tmpfile = tmp_path / "foo"
+    sls_contents = f"""
+        service_a:
+          cmd.run:
+              - name: sleep 3
+              - parallel: True
+
+        service_b:
+          cmd.run:
+              - name: 'touch {tmpfile}'
+              - parallel: True
+              - require:
+                  - service_a
+
+        service_c:
+          cmd.run:
+              - name: 'test -f {tmpfile}'
+              - require:
+                  - service_b
+    """
+
+    with pytest.helpers.temp_file("requisite_parallel_2.sls", sls_contents, state_tree):
+        ret = state.sls(
+            "requisite_parallel_2",
+            __pub_jid="1",  # Because these run in parallel we need a fake JID)
+        )
+        assert ret[f"cmd_|-service_c_|-test -f {tmpfile}_|-run"]["result"] is True
+
+
 def test_issue_59922_conflict_in_name_and_id_for_require_in(state, state_tree):
     """
     Make sure that state_type is always honored while compiling down require_in to
