saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

When building up the 'master_uri_list', do not try to connect

Browse source 
The connection attempts will happen later, sequentially. This will
avoid a case where it can't connect to a salt-master later in the
list but can connect to an earlier one. Before the fix, it will take
extra time while the later connection attempts fail, even though
it won't need to use them.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
This commit is contained in:
Sergey Kizunov 2017-03-16 15:29:16 -05:00
parent 9ef3e070c2
commit eb9a0a6fd1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/minion.py
View file

@ -541,7 +541,7 @@ class MinionBase(object):
for master in opts['local_masters']:
opts['master'] = master
opts.update(prep_ip_port(opts))
opts['master_uri_list'].append(resolve_dns(opts)['master_uri'])
opts['master_uri_list'].append(resolve_dns(opts, connect=False)['master_uri'])
while True:
if attempts != 0: