From 2d4fe5829913481b3f0f39cae74f0e0f7d17b0bd Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 1 Dec 2020 21:43:38 -0500 Subject: [PATCH] [fix] Also kill currently running jobs --- setup/so-functions | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index d4acd8a75..a54153077 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1390,9 +1390,12 @@ reinstall_init() { local service_retry_count=20 { - # Disable all scheduled jobs if command -v salt-call &> /dev/null; then - salt-call schedule.disable + # Disable scheduled jobs so highstate doesn't start running during the install + salt-call -l info schedule.disable + + # Kill any currently running salt jobs, also to prevent issues with highstate. + salt-call -l info saltutil.kill_all_jobs fi # Kill any salt processes (safely)