From 2d0ea48c39a323b1018528fce52d46401dc410d8 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 10 Aug 2026 08:27:40 -0400 Subject: [PATCH] so-grid-highstate: drop the .log extension from the log path Rename the grid-highstate log from /opt/so/log/salt/so-grid-highstate.log to /opt/so/log/salt/so-grid-highstate. Updates the LOG_FILE var in so-grid-highstate and the two /opt/so/log/salt/so-grid-highstate.log references in soup (the progress echo and the distributed-deployment message). --- salt/manager/tools/sbin/so-grid-highstate | 2 +- salt/manager/tools/sbin/soup | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/manager/tools/sbin/so-grid-highstate b/salt/manager/tools/sbin/so-grid-highstate index 6abe43279..e0153b2ee 100644 --- a/salt/manager/tools/sbin/so-grid-highstate +++ b/salt/manager/tools/sbin/so-grid-highstate @@ -28,7 +28,7 @@ # This is best-effort: soup has already completed by the time this runs, and the 120-minute # scheduled highstate remains the backstop for any node that is offline or missed a batch. -LOG_FILE=/opt/so/log/salt/so-grid-highstate.log +LOG_FILE=/opt/so/log/salt/so-grid-highstate LOCK_FILE=/opt/so/state/so-grid-highstate.lock SETTLE_MAX_WAIT=${GRID_HIGHSTATE_SETTLE_WAIT:-900} # backstop for the post-salt-upgrade settle loop SETTLE_INTERVAL=15 diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index bc7ac559c..3644b9d83 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -476,7 +476,7 @@ push_grid_highstate() { extra_args+=(--batch "$BATCHSIZE") fi - echo "Dispatching a grid-wide highstate to remote nodes. Progress: /opt/so/log/salt/so-grid-highstate.log" + echo "Dispatching a grid-wide highstate to remote nodes. Progress: /opt/so/log/salt/so-grid-highstate" setsid nohup /usr/sbin/so-grid-highstate --reason soup "${extra_args[@]}" >/dev/null 2>&1 & } @@ -2154,7 +2154,7 @@ main() { -This appears to be a distributed deployment. soup has dispatched a batched, grid-wide highstate to update the other nodes now: Elasticsearch data nodes (search/heavy nodes) first, then receivers, then sensors and the remaining nodes. Progress is logged to /opt/so/log/salt/so-grid-highstate.log, and you can watch nodes update from the Grid section of SOC. Do not manually restart anything until you know that all the search/heavy nodes in your deployment are updated. This is especially important if you are using true clustering for Elasticsearch. +This appears to be a distributed deployment. soup has dispatched a batched, grid-wide highstate to update the other nodes now: Elasticsearch data nodes (search/heavy nodes) first, then receivers, then sensors and the remaining nodes. Progress is logged to /opt/so/log/salt/so-grid-highstate, and you can watch nodes update from the Grid section of SOC. Do not manually restart anything until you know that all the search/heavy nodes in your deployment are updated. This is especially important if you are using true clustering for Elasticsearch. Nodes are updated in batches, and things like network bandwidth can be a factor in how long the actual upgrade takes. If you have a heavy node on a slow link, it is going to take a while to get the containers to it. Depending on what changes happened between the versions, Elasticsearch might not be able to talk to said heavy node until the update is complete. Any node that is offline or missed a batch will converge on its own scheduled highstate (every 120 minutes by default).