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

Merge pull request #35720 from hu-dabao/fix-20575

Browse source 
fix 20575, make subset really return random subset
This commit is contained in:
Mike Place 2016-08-24 16:03:58 +09:00 • committed by GitHub
commit 79d10aea2d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/client/__init__.py
View file

@ -22,6 +22,7 @@ The data structure needs to be:
from __future__ import absolute_import, print_function
import os
import time
import random
import logging
from datetime import datetime
@ -375,13 +376,15 @@ class LocalClient(object):
>>> SLC.cmd_subset('*', 'test.ping', sub=1)
{'jerry': True}
'''
group = self.cmd(tgt, 'sys.list_functions', expr_form=expr_form, **kwargs)
minion_ret = self.cmd(tgt, 'sys.list_functions', expr_form=expr_form, **kwargs)
minions = minion_ret.keys()
random.shuffle(minions)
f_tgt = []
for minion, ret in six.iteritems(group):
for minion in minions:
if fun in minion_ret[minion]:
f_tgt.append(minion)
if len(f_tgt) >= sub:
break
if fun in ret:
f_tgt.append(minion)
func = self.cmd
if cli:
func = self.cmd_cli