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

Merge pull request #16258 from thatch45/ssh_refactor_fsclient

Browse Source 
Change the fsclient to only be created once
This commit is contained in:
Thomas S Hatch 2014-09-29 23:00:44 -06:00
commit 48fd56ce05
5 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/client/ssh/__init__.py
View File

@ -223,6 +223,7 @@ class SSH(object):
}
self.serial = salt.payload.Serial(opts)
self.returners = salt.loader.returners(self.opts, {})
self.fsclient = salt.fileclient.FSClient(self.opts)
self.mods = mod_data(self.opts)
def get_pubkey(self):
@ -280,6 +281,7 @@ class SSH(object):
argv,
host,
mods=self.mods,
fsclient=self.fsclient,
**target)
if salt.utils.which('ssh-copy-id'):
# we have ssh-copy-id, use it!
@ -293,6 +295,7 @@ class SSH(object):
self.opts['argv'],
host,
mods=self.mods,
fsclient=self.fsclient,
**target)
stdout, stderr, retcode = single.cmd_block()
try:
@ -316,6 +319,7 @@ class SSH(object):
opts['argv'],
host,
mods=self.mods,
fsclient=self.fsclient,
**target)
ret = {'id': single.id}
stdout, stderr, retcode = single.run()
@ -499,6 +503,7 @@ class Single(object):
sudo=False,
tty=False,
mods=None,
fsclient=None,
**kwargs):
self.opts = opts
if user:
@ -506,6 +511,9 @@ class Single(object):
else:
self.thin_dir = DEFAULT_THIN_DIR.replace('%%USER%%', 'root')
self.opts['_thin_dir'] = self.thin_dir
self.fsclient = fsclient
self.context = {'master_opts': self.opts,
'fileclient': self.fsclient}
if isinstance(argv, string_types):
self.argv = [argv]
@ -532,7 +540,7 @@ class Single(object):
self.target = kwargs
self.target.update(args)
self.serial = salt.payload.Serial(opts)
self.wfuncs = salt.loader.ssh_wrapper(opts, None, self.opts)
self.wfuncs = salt.loader.ssh_wrapper(opts, None, self.context)
self.mods = mods if mods else {}
def __arg_comps(self):
@ -693,7 +701,7 @@ class Single(object):
self.id,
mods=self.mods,
**self.target)
self.wfuncs = salt.loader.ssh_wrapper(opts, wrapper, self.opts)
self.wfuncs = salt.loader.ssh_wrapper(opts, wrapper, self.context)
wrapper.wfuncs = self.wfuncs
try:
result = self.wfuncs[self.fun](*self.args, **self.kwargs)

9
salt/client/ssh/state.py
View File

@ -57,10 +57,8 @@ class SSHHighState(salt.state.BaseHighState):
'''
stack = []
def __init__(self, opts, pillar=None, wrapper=None, mopts=None):
if mopts is None:
mopts = {}
self.client = salt.fileclient.FSClient(mopts)
def __init__(self, opts, pillar=None, wrapper=None, fsclient=None):
self.client = fsclient
salt.state.BaseHighState.__init__(self, opts)
self.state = SSHState(opts, pillar, wrapper)
self.matcher = salt.minion.Matcher(self.opts)
@ -119,14 +117,13 @@ def salt_refs(data):
return ret
def prep_trans_tar(opts, chunks, file_refs, pillar=None):
def prep_trans_tar(file_client, chunks, file_refs, pillar=None):
'''
Generate the execution package from the saltenv file refs and a low state
data structure
'''
gendir = tempfile.mkdtemp()
trans_tar = salt.utils.mkstemp()
file_client = salt.fileclient.FSClient(opts)
lowfn = os.path.join(gendir, 'lowstate.json')
pillarfn = os.path.join(gendir, 'pillar.json')
sync_refs = [

28
salt/client/ssh/wrapper/state.py
View File

@ -41,7 +41,7 @@ def sls(mods, saltenv='base', test=None, exclude=None, env=None, **kwargs):
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
if isinstance(mods, str):
mods = mods.split(',')
high_data, errors = st_.render_highstate({saltenv: mods})
@ -67,7 +67,7 @@ def sls(mods, saltenv='base', test=None, exclude=None, env=None, **kwargs):
chunks = st_.state.compile_high_data(high_data)
file_refs = salt.client.ssh.state.lowstate_file_refs(chunks, kwargs.get('extra_filerefs', ''))
trans_tar = salt.client.ssh.state.prep_trans_tar(
__master_opts__,
__context__['fileclient'],
chunks,
file_refs,
__pillar__)
@ -114,13 +114,13 @@ def low(data, **kwargs):
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
err = st_.verify_data(data)
if err:
return err
file_refs = salt.client.ssh.state.lowstate_file_refs(chunks, kwargs.get('extra_filerefs', ''))
trans_tar = salt.client.ssh.state.prep_trans_tar(
__master_opts__,
__context__['fileclient'],
chunks,
file_refs,
__pillar__)
@ -160,11 +160,11 @@ def high(data, **kwargs):
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
chunks = st_.state.compile_high_data(high)
file_refs = salt.client.ssh.state.lowstate_file_refs(chunks, kwargs.get('extra_filerefs', ''))
trans_tar = salt.client.ssh.state.prep_trans_tar(
__master_opts__,
__context__['fileclient'],
chunks,
file_refs,
__pillar__)
@ -206,11 +206,11 @@ def highstate(test=None, **kwargs):
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
chunks = st_.compile_low_chunks()
file_refs = salt.client.ssh.state.lowstate_file_refs(chunks, kwargs.get('extra_filerefs', ''))
trans_tar = salt.client.ssh.state.prep_trans_tar(
__master_opts__,
__context__['fileclient'],
chunks,
file_refs,
__pillar__)
@ -261,12 +261,12 @@ def top(topfn, test=None, **kwargs):
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
st_.opts['state_top'] = os.path.join('salt://', topfn)
chunks = st_.compile_low_chunks()
file_refs = salt.client.ssh.state.lowstate_file_refs(chunks, kwargs.get('extra_filerefs', ''))
trans_tar = salt.client.ssh.state.prep_trans_tar(
__master_opts__,
__context__['fileclient'],
chunks,
file_refs,
__pillar__)
@ -306,7 +306,7 @@ def show_highstate():
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
return st_.compile_highstate()
@ -325,7 +325,7 @@ def show_lowstate():
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
return st_.compile_low_chunks()
@ -359,7 +359,7 @@ def show_sls(mods, saltenv='base', test=None, env=None, **kwargs):
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
high_data, errors = st_.render_highstate({saltenv: mods})
high_data, ext_errors = st_.state.reconcile_extend(high_data)
errors += ext_errors
@ -390,7 +390,7 @@ def show_top():
__opts__,
__pillar__,
__salt__,
__master_opts__)
__context__['fileclient'])
top_data = st_.get_top()
errors = []
errors += st_.verify_tops(top_data)

3
salt/fileserver/__init__.py
View File

@ -551,6 +551,7 @@ class FSChan(object):
self.fs = Fileserver(self.opts)
self.fs.init()
self.fs.update()
self.cmd_stub = {'ext_nodes': {}}
def send(self, load, tries=None, timeout=None):
'''
@ -560,6 +561,8 @@ class FSChan(object):
log.error('Malformed request, no cmd: {0}'.format(load))
return {}
cmd = load['cmd'].lstrip('_')
if cmd in self.cmd_stub:
return self.cmd_stub[cmd]
if not hasattr(self.fs, cmd):
log.error('Malformed request, invalid cmd: {0}'.format(load))
return {}

12
salt/loader.py
View File

@ -291,12 +291,12 @@ def log_handlers(opts):
return load.filter_func('setup_handlers')
def ssh_wrapper(opts, functions=None, mopts=None):
def ssh_wrapper(opts, functions=None, context=None):
'''
Returns the custom logging handler modules
'''
if mopts is None:
mopts = {}
if context is None:
context = {}
if functions is None:
functions = {}
load = _create_loader(
@ -307,12 +307,10 @@ def ssh_wrapper(opts, functions=None, mopts=None):
'client',
'ssh'))
)
pack = {'name': '__salt__',
'value': functions}
pack = [{'name': '__salt__',
'value': functions},
{'name': '__master_opts__',
'value': mopts}]
{'name': '__context__',
'value': context}]
return load.gen_functions(pack)