From caa14e0cade92be5c481d65688178da37584af88 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 22 Jun 2021 10:14:33 -0400 Subject: [PATCH] Fix Retry Spam --- salt/common/tools/sbin/soup | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 1a8b7cef5..c1e25b208 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -884,7 +884,8 @@ main() { # Testing that salt-master is up by checking that is it connected to itself set +e - retry 50 10 "salt-call state.show_top -l error" || fail "salt-master could not be reached. Check $SOUP_LOG for details." + echo "Waiting on the Salt Master service to be ready." + salt-call state.show_top -l error queue=True || fail "salt-master could not be reached. Check $SOUP_LOG for details." set -e echo "" @@ -920,9 +921,9 @@ main() { echo "Starting Salt Master service." systemctl start salt-master - # Testing that salt-master is up by checking that is it connected to itself set +e - retry 50 10 "salt-call state.show_top -l error" || fail "salt-master could not be reached. Check $SOUP_LOG for details." + echo "Waiting on the Salt Master service to be ready." + salt-call state.show_top -l error queue=True || fail "salt-master could not be reached. Check $SOUP_LOG for details." set -e echo "Running a highstate. This could take several minutes." @@ -996,4 +997,4 @@ EOF read -r input main "$@" | tee -a $SOUP_LOG - \ No newline at end of file +