From 4b14bf90a3fe56128372eacf6bc586e5a9857fae Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Fri, 11 Apr 2025 14:28:18 -0400 Subject: [PATCH] ensure the highstate retry runs only once --- salt/salt/master/mine_update_highstate.sls | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/salt/master/mine_update_highstate.sls b/salt/salt/master/mine_update_highstate.sls index 874e6c65b..c91be20e9 100644 --- a/salt/salt/master/mine_update_highstate.sls +++ b/salt/salt/master/mine_update_highstate.sls @@ -19,8 +19,11 @@ salt.master.mine_update_highstate.update_mine_all_minions: # Run highstate on the original minion # we can use concurrent on this highstate because no other highstate would be running when this is called +# this state will run onlyif there is not an instance of it already running salt.master.mine_update_highstate.run_highstate_on_{{ MINION_ID }}: salt.state: - tgt: {{ MINION_ID }} - highstate: True - concurrent: True + - onlyif: + - 'ps -ef | grep -v grep | grep "/usr/bin/salt-minion.*ProcessPayload.*jid=.*Minion._thread_return" | wc -l | grep -q "^0$"'