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

Only allow one sync read to happen at a time.

Browse source
This commit is contained in:
Pedro Algarvio 2016-08-12 12:18:24 +01:00
parent c032506e6b
commit f54b3cc514
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/transport/ipc.py
View file

@ -16,9 +16,9 @@ import tornado
import tornado.gen
import tornado.netutil
import tornado.concurrent
from tornado.locks import Semaphore
from tornado.ioloop import IOLoop
from tornado.iostream import IOStream
# Import Salt libs
import salt.transport.client
import salt.transport.frame
@ -584,9 +584,11 @@ class IPCMessageSubscriber(IPCClient):
self._read_stream_future = None
self._sync_ioloop_running = False
self.saved_data = []
self._sync_read_in_progress = Semaphore()
@tornado.gen.coroutine
def _read_sync(self, timeout):
yield self._sync_read_in_progress.acquire()
exc_to_raise = None
ret = None
@ -640,6 +642,7 @@ class IPCMessageSubscriber(IPCClient):
if exc_to_raise is not None:
raise exc_to_raise # pylint: disable=E0702
self._sync_read_in_progress.release()
raise tornado.gen.Return(ret)
def read_sync(self, timeout=None):