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

Added module globals in transport.py for RaetChannel so that in multi-master jobber yard know which master

Browse Source 
initiated job so that it can respond to the correct estate

Fixed typos

Fixed lint errors
This commit is contained in:
Samuel M Smith 2014-10-30 14:07:48 -06:00
parent 49626afe30
commit 03ebb6326f
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/daemons/flo/core.py
View File

@ -182,6 +182,7 @@ class SaltRaetRoadStackSetup(ioflo.base.deeding.Deed):
if self.opts.value.get('raet_clear_remotes'):
for remote in self.stack.value.remotes.values():
self.stack.value.removeRemote(remote, clear=True)
self.stack.puid = self.stack.value.Uid # reset puid
class SaltRaetRoadStackCloser(ioflo.base.deeding.Deed):
@ -235,7 +236,7 @@ class SaltRaetRoadStackJoiner(ioflo.base.deeding.Deed):
for remote in stack.remotes.values():
stack.removeRemote(remote, clear=True)
stack.puid = stack.Uid # reset puid so reuse same uid each time
stack.puid = stack.Uid # reset puid so reuse same uid each time
for master in self.masters:
mha = master['external']
@ -1136,6 +1137,10 @@ class SaltRaetNixJobber(ioflo.base.deeding.Deed):
salt.utils.daemonize_if(self.opts)
salt.transport.jobber_stack = stack = self._setup_jobber_stack()
# set up return destination from source
src_estate, src_yard, src_share = msg['route']['src']
salt.transport.jobber_estate_name = src_estate
salt.transport.jobber_yard_name = src_yard
sdata = {'pid': os.getpid()}
sdata.update(data)

28
salt/transport/__init__.py
View File

@ -26,8 +26,18 @@ except ImportError:
# Don't die on missing transport libs since only one transport is required
pass
jobber_stack = None # global that holds raet jobber LaneStack
jobber_rxMsgs = {} # dict of deques one for each RaetChannel
# Module globals for default LaneStack. Because RaetChannels are created on demand
# they do not have access to the master estate that motivated their creation
# Also in Raet a LaneStack can be shared shared by all channels in a given jobber
# For these reasons module globals are used to setup a shared jobber_stack as
# well has routing information for the master that motivated the jobber
# when a channel is not used in a jobber context then a LaneStack is created
# on demand.
jobber_stack = None # module global that holds raet jobber LaneStack
jobber_rxMsgs = {} # dict of deques one for each RaetChannel for the jobber
jobber_estate_name = None # module global of motivating master estate name
jobber_yard_name = None # module global of motivating master yard name
class Channel(object):
@ -76,12 +86,14 @@ class RAETChannel(Channel):
def __init__(self, opts, usage=None, **kwargs):
self.opts = opts
self.ttype = 'raet'
if usage == 'master_call':
self.dst = (None, None, 'local_cmd') # runner.py master_call
elif usage == 'salt_call':
self.dst = (None, None, 'remote_cmd') # salt_call caller
else: # everything else minion
self.dst = (None, None, 'remote_cmd') # normal use case minion to master
if usage == 'master_call': # runner.py master_call
self.dst = (None, None, 'local_cmd')
elif usage == 'salt_call': # salt_call caller
self.dst = (None, None, 'remote_cmd')
else: # everything else minion to master
self.dst = (jobber_estate_name or None,
jobber_yard_name or None,
'remote_cmd')
self.stack = None
def _setup_stack(self):