Fix a bug where salt-minion process does not restart during upgrade #3281
Conversation
By default salt master timeout is set to 5 seconds, and time to time it's not sufficient, as pillar compute may take some time and also it happens that some time a salt-minion take a bit of time to answer a job listing when executing a salt states (cherry picked from commit 2caba9e)
Time to time salt-master get overloaded because he receive to much query, for example during upgrade and one environment a bit slow some salt states may timeout and make the upgrade fail. To avoid that kind of issue just bump the `sock_pool_size` on salt master (from 1 to 15) to avoid blocking waiting for zeromq communications and also bump the `worker_threads` on salt master (from 5 to 10) to avoid some failure if you have too many communication with the salt master (e.g.: because of upgrade + storage operator) Sees: saltstack/salt#53147 (cherry picked from commit 21d679a)
Hello teddyandrieux,My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.6/bugfix/salt-minion-restart origin/development/2.6
$ git merge origin/bugfix/salt-minion-restart
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.6/bugfix/salt-minion-restart |
As suggested by Salt to restart Salt-minion process we should just `service.restart` in Background and then wait for the Salt-minion to be ready, in our case as part of the orchestrate Sees: https://docs.saltproject.io/en/latest/faq.html#restart-using-states Fixes: #3247
Add some explanation about all state in `init.sls` of Salt minion states
Before this commit we were only calling the "Reconfigure salt-minion" state if we are not on first node deployment, but state may do some changes that require a Salt minion process to restart. For example the salt package get hold only when you call the salt minion state when salt already installed
TeddyAndrieux
force-pushed
the
bugfix/salt-minion-restart
branch
from
67b8978 to
14321d2
Compare
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.7/bugfix/salt-minion-restart origin/development/2.7
$ git merge origin/w/2.6/bugfix/salt-minion-restart
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.7/bugfix/salt-minion-restart |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.8/bugfix/salt-minion-restart origin/development/2.8
$ git merge origin/w/2.7/bugfix/salt-minion-restart
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.8/bugfix/salt-minion-restart |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
|
/approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye teddyandrieux. |
Component:
'salt', 'upgrade'
Context:
#3247
Summary:
init.slsfor salt minion as it was a bit outdatedFixes: #3247