Back-port #35463 to 2016.3 #35489
Merged
Back-port #35463 to 2016.3 #35489
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was code that was overriding the value of `auth_timeout` regardless of what was set in the configuration. It was overriding it to be 5 seconds. Although 5 seconds is sufficient for most cases, in testing, I have found it insufficient for the following use case (running both Windows master and minions): 1) Start salt-master 2) Start salt-minion 3) Stop salt-master 4) Start salt-master The minion reconnect will timeout after step 4. Due to this, we set the `auth_timeout` to be 15 seconds in our own configuration file. However, due to this issue, that configuration value was ignored and thus we fail on reconnects. `salt/minion.py`: - Don't hard-code the `auth_timeout` to 5 seconds. Use the user configured value (or the default value if the user didn't configure a value). `salt/config/__init__.py`: - Made the default be 5 seconds for `auth_timeout` instead of 60. Chose 5 seconds because this is the current hard-coded behavior. Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
|
I'd rather just have @skizunov review it if he's available. :] |
|
In Curious as to why the linter didn't tell us that |
|
Actually, it should be changed to |
|
Ah, good catch @skizunov. I guess because of the |
|
@rallytime : It looks fine now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Back-port #35463 to 2016.3
@cachedout Please review this back-port from @skizunov's PR to develop. There was a merge-conflict in the back-port, but I think this is the correct resolution because the
auth_timeoutoption should come from through in thes_opts = copy.deepcopy(self.opts), right?