valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 'failover' mode when using salt-call

Browse Source 
'failover' mode, among other things, was intended to be handled in
`SMinion.__init__`. Unfortunately, the original code simply had:

`self.eval_master(self.opts, failed=True)`

This will do nothing, since `self.eval_master` will return a future
and nothing actually runs that future (it isn't added to any IO loop,
just discarded). Now we synchronously invoke that future to make sure
that this logic is executed before code flow continues.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
This commit is contained in:
Sergey Kizunov 2016-02-26 15:30:34 -06:00
parent 45d840845d
commit 2cc0231584
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/minion.py
View File

@ -530,7 +530,9 @@ class SMinion(MinionBase):
# Clean out the proc directory (default /var/cache/salt/minion/proc)
if (self.opts.get('file_client', 'remote') == 'remote'
or self.opts.get('use_master_when_local', False)):
self.eval_master(self.opts, failed=True)
LOOP_CLASS.current().run_sync(
lambda: self.eval_master(self.opts, failed=True)
)
self.gen_modules(initial_load=True)
# If configured, cache pillar data on the minion