M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

scheduler: do not duplicate 'run terminated' information

This commit is contained in:
Sebastien Bourdeauducq 2015-05-28 17:37:08 +08:00
parent 4a7c6954c3
commit e752e57fa5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/master/scheduler.py
View File

@ -26,7 +26,7 @@ class RunStatus(Enum):
def _mk_worker_method(name): def _mk_worker_method(name):
@asyncio.coroutine @asyncio.coroutine
def worker_method(self, *args, **kwargs): def worker_method(self, *args, **kwargs):
if self._terminated: if self._worker.closed.is_set():
return True return True
m = getattr(self._worker, name) m = getattr(self._worker, name)
try: try:
@ -34,7 +34,7 @@ def _mk_worker_method(name):
except Exception as e: except Exception as e:
if isinstance(e, asyncio.CancelledError): if isinstance(e, asyncio.CancelledError):
raise raise
if self._terminated: if self._worker.closed.is_set():
logger.debug("suppressing worker exception of terminated run", logger.debug("suppressing worker exception of terminated run",
exc_info=True) exc_info=True)
# Return completion on termination # Return completion on termination
@ -57,7 +57,6 @@ class Run:
self.flush = flush self.flush = flush
self._status = RunStatus.pending self._status = RunStatus.pending
self._terminated = False
self._worker = Worker(worker_handlers) self._worker = Worker(worker_handlers)
self._notifier = notifier self._notifier = notifier
@ -77,7 +76,7 @@ class Run:
@status.setter @status.setter
def status(self, value): def status(self, value):
self._status = value self._status = value
if not self._terminated: if not self._worker.closed.is_set():
self._notifier[self.rid]["status"] = self._status.name self._notifier[self.rid]["status"] = self._status.name
# The run with the largest priority_key is to be scheduled first # The run with the largest priority_key is to be scheduled first
@ -93,7 +92,6 @@ class Run:
@asyncio.coroutine @asyncio.coroutine
def close(self): def close(self):
# called through pool # called through pool
self._terminated = True
yield from self._worker.close() yield from self._worker.close()
del self._notifier[self.rid] del self._notifier[self.rid]