afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed lock for distributed commands and limited usage to uploads

Browse source
This commit is contained in:
Blake Harnden 2019-10-16 20:19:51 -07:00
parent 8aef9f273f
commit 009ce8143e
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/core/emulator/distributed.py
View file

@ -53,16 +53,15 @@ class DistributedServer(object):
"remote cmd server(%s) cwd(%s) wait(%s): %s", self.host, cwd, wait, cmd "remote cmd server(%s) cwd(%s) wait(%s): %s", self.host, cwd, wait, cmd
) )
try: try:
with self.lock: if cwd is None:
if cwd is None: result = self.conn.run(
cmd, hide=False, env=env, replace_env=replace_env
)
else:
with self.conn.cd(cwd):
result = self.conn.run( result = self.conn.run(
cmd, hide=False, env=env, replace_env=replace_env cmd, hide=False, env=env, replace_env=replace_env
) )
else:
with self.conn.cd(cwd):
result = self.conn.run(
cmd, hide=False, env=env, replace_env=replace_env
)
return result.stdout.strip() return result.stdout.strip()
except UnexpectedExit as e: except UnexpectedExit as e:
stdout, stderr = e.streams_for_display() stdout, stderr = e.streams_for_display()

1
daemon/core/nodes/physical.py
View file

@ -167,7 +167,6 @@ class PhysicalNode(CoreNodeBase):
# this is reached when this node is linked to a network node # this is reached when this node is linked to a network node
# tunnel to net not built yet, so build it now and adopt it # tunnel to net not built yet, so build it now and adopt it
_, remote_tap = self.session.create_gre_tunnel(net, self.server) _, remote_tap = self.session.create_gre_tunnel(net, self.server)
# net.detach(remote_tap)
self.adoptnetif(remote_tap, ifindex, hwaddr, addrlist) self.adoptnetif(remote_tap, ifindex, hwaddr, addrlist)
return ifindex return ifindex
else: else: