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 #14381 from SmithSamuelM/sam_2014.7

Browse Source 
Added consistent indexing access to remotes by uid, by name, and by ha
Needs Raet v0.2.05
This commit is contained in:
Samuel Smith 2014-07-21 18:01:33 -06:00
commit 6fe350be54
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -730,8 +730,9 @@ class Router(ioflo.base.deeding.Deed):
return
if d_yard is not None:
# Meant for another yard, send it off!
if d_yard in self.uxd_stack.value.uids:
self.uxd_stack.value.transmit(msg, self.uxd_stack.value.uids[d_yard])
if d_yard in self.uxd_stack.value.nameRemotes:
self.uxd_stack.value.transmit(msg,
self.uxd_stack.value.nameRemotes[d_yard].uid)
return
return
if d_share is None:
@ -747,7 +748,7 @@ class Router(ioflo.base.deeding.Deed):
if 'load' in msg:
msg['load']['id'] = sender
self.uxd_stack.value.transmit(msg,
self.uxd_stack.value.uids.get(next(self.workers.value)))
self.uxd_stack.value.fetchUidByName(next(self.workers.value)))
elif d_share == 'fun':
self.fun.value.append(msg)
@ -770,7 +771,7 @@ class Router(ioflo.base.deeding.Deed):
pass
elif d_estate != self.udp_stack.value.local:
# Forward to the correct estate
eid = self.udp_stack.value.uids.get(d_estate)
eid = self.udp_stack.value.fetchUidByName(d_estate)
self.udp_stack.value.message(msg, eid)
return
if d_share == 'pub_ret':
@ -780,8 +781,9 @@ class Router(ioflo.base.deeding.Deed):
pass
elif d_yard != self.uxd_stack.value.local.name:
# Meant for another yard, send it off!
if d_yard in self.uxd_stack.value.uids:
self.uxd_stack.value.transmit(msg, self.uxd_stack.value.uids[d_yard])
if d_yard in self.uxd_stack.value.nameRemotes:
self.uxd_stack.value.transmit(msg,
self.uxd_stack.value.nameRemotes[d_yard].uid)
return
return
if d_share is None:
@ -790,7 +792,7 @@ class Router(ioflo.base.deeding.Deed):
return
elif d_share == 'local_cmd':
self.uxd_stack.value.transmit(msg,
self.uxd_stack.value.uids.get(next(self.workers.value)))
self.uxd_stack.value.fetchUidByName(next(self.workers.value)))
elif d_share == 'event_req':
self.event_req.value.append(msg)
elif d_share == 'event_fire':
@ -840,14 +842,14 @@ class Eventer(ioflo.base.deeding.Deed):
if event.get('tag') == 'module_refresh':
self.module_refresh.value = True
for y_name in self.event_yards.value:
if y_name not in self.uxd_stack.value.uids:
if y_name not in self.uxd_stack.value.nameRemotes:
rm_.append(y_name)
continue
route = {'src': ('router', self.uxd_stack.value.local.name, None),
'dst': ('router', y_name, None)}
msg = {'route': route, 'event': event}
self.uxd_stack.value.transmit(msg,
self.uxd_stack.value.uids.get(y_name))
self.uxd_stack.value.fetchUidByName(y_name))
self.uxd_stack.value.serviceAll()
for y_name in rm_:
self.event_yards.value.remove(y_name)
@ -888,9 +890,9 @@ class SaltPublisher(ioflo.base.deeding.Deed):
'''
pub_data = pub_msg['return']
# only publish to available minions by intersecting sets
minions = self.availables.value & set(self.stack.value.uids.keys())
minions = self.availables.value & set(self.stack.value.nameRemotes.keys())
for minion in minions:
eid = self.stack.value.uids.get(minion)
eid = self.stack.value.fetchUidByName(minion)
if eid:
route = {
'dst': (minion, None, 'fun'),
@ -974,7 +976,7 @@ class NixExecutor(ioflo.base.deeding.Deed):
if isinstance(oput, str):
ret['out'] = oput
msg = {'route': route, 'load': ret}
stack.transmit(msg, stack.uids.get('manor'))
stack.transmit(msg, stack.fetchUidByName('manor'))
stack.serviceAll()
def action(self):

5
salt/daemons/flo/worker.py
View File

@ -137,7 +137,7 @@ class WorkerSetup(ioflo.base.deeding.Deed):
'src': (None, self.stack.value.local.name, None),
'dst': (None, manor_yard.name, 'worker_req')
}
self.stack.value.transmit(init, self.stack.value.uids.get(manor_yard.name))
self.stack.value.transmit(init, self.stack.value.fetchUidByName(manor_yard.name))
self.stack.value.serviceAll()
def __del__(self):
@ -192,5 +192,6 @@ class WorkerRouter(ioflo.base.deeding.Deed):
'src': (self.opts.value.get('id', 'master'), self.uxd_stack.value.local.name, None),
'dst': (msg['route']['src'][0], msg['route']['src'][1], r_share)
}
self.uxd_stack.value.transmit(ret, self.uxd_stack.value.uids.get('manor'))
self.uxd_stack.value.transmit(ret,
self.uxd_stack.value.fetchUidByName('manor'))
self.uxd_stack.value.serviceAll()

4
salt/transport/__init__.py
View File

@ -119,7 +119,7 @@ class RAETChannel(Channel):
src = (mid, self.stack.local.name, track)
self.route = {'src': src, 'dst': self.dst}
msg = {'route': self.route, 'load': load}
self.stack.transmit(msg, self.stack.uids['manor'])
self.stack.transmit(msg, self.stack.nameRemotes['manor'].uid)
while track not in jobber_rxMsgs:
self.stack.serviceAll()
while self.stack.rxMsgs:
@ -131,7 +131,7 @@ class RAETChannel(Channel):
if time.time() - start > timeout:
if tried >= tries:
raise ValueError
self.stack.transmit(msg, self.stack.uids['manor'])
self.stack.transmit(msg, self.stack.nameRemotes['manor'].uid)
tried += 1
time.sleep(0.01)
return jobber_rxMsgs.pop(track).get('return', {})