From 02969f7721c5df58a17dc45ae017e5a45dadc8e2 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 10 May 2016 09:09:53 +0200
Subject: [PATCH] [backend] Check worker environments
---
beat/web/backend/models.py | 38 ++++++++++++++++++++++++++++++++++++++
beat/web/backend/views.py | 16 ++++++++++++++++
beat/web/scripts/worker.py | 19 ++++++++++++++++++-
todo.rst | 6 ++++++
4 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/beat/web/backend/models.py b/beat/web/backend/models.py
index fce438433..e955b4c10 100644
--- a/beat/web/backend/models.py
+++ b/beat/web/backend/models.py
@@ -260,6 +260,44 @@ class Worker(models.Model):
return dict(cores=self.cores, memory=self.memory)
+ def check_environments(self, environments):
+ '''Checks that this worker has access to all environments it needs
+
+ This method will check if the found set of environments (in the
+ dictionary ``environments``) contains, at least, one environment for
+ each environment object this worker is supposed to be able to execute
+ user algorithms for.
+
+
+ Parameters:
+
+ environments (dict): A dictionary of environments found by using
+ :py:func:`utils.find_environments` in which, keys represent the
+ natural keys of Django database environments.
+
+
+ Returns:
+
+ list: A list of missing environments this worker can be assigned to
+ work with, but where not found
+
+ list: A list of unused environments this worker cannot be assigned to
+ work with, but where nevertheless found
+
+ '''
+
+ slots = Slot.objects.filter(worker=self)
+ queues = Queue.objects.filter(slots__in=slots)
+ wishlist = Environment.objects.filter(queues__in=queues)
+ wishlist = wishlist.order_by('id').distinct()
+
+ required = [k.natural_key() for k in wishlist]
+ missing = [k for k in required if k not in environments]
+ unused = [k for k in environments if k not in required]
+
+ return missing, unused
+
+
def update_state(self):
'''Updates state on the database based on current machine readings'''
diff --git a/beat/web/backend/views.py b/beat/web/backend/views.py
index a7850f62c..c3bac6c25 100644
--- a/beat/web/backend/views.py
+++ b/beat/web/backend/views.py
@@ -66,10 +66,26 @@ class Work:
def __setup__(self):
Work.cpulimit = resolve_cpulimit_path(None)
+ logger.debug("(path) cpulimit: `%s'", Work.cpulimit)
Work.process = utils.resolve_process_path()
+ logger.debug("(path) process: `%s'", Work.process)
Work.environments = utils.find_environments(None)
+ logger.debug("Environments: %s", ", ".join(Work.environments))
+
+ # load worker, check environments, activate it
w = Worker.objects.get(name=socket.gethostname()) \
if Worker.objects.count() != 1 else Worker.objects.get()
+ missing, unused = w.check_environments(Work.environments)
+ if unused:
+ logger.info("The following environments where found on your " \
+ "setup, but will not be used with the current queue " \
+ "configuration: %s" % ", ".join(unused))
+ if missing:
+ raise RuntimeError("The following environments are currently " \
+ "missing from your setup: %s" % ", ".join(missing))
+ else:
+ logger.info("All required software environments were found")
+
w.activate()
w.save()
Work.worker = w
diff --git a/beat/web/scripts/worker.py b/beat/web/scripts/worker.py
index dadc88c2d..8f9ffac4d 100644
--- a/beat/web/scripts/worker.py
+++ b/beat/web/scripts/worker.py
@@ -117,15 +117,32 @@ def main(user_input=None):
from beat.core.async import resolve_cpulimit_path
cpulimit = resolve_cpulimit_path(arguments['--cpulimit'])
+ logger.debug("(path) cpulimit: `%s'", cpulimit)
process = utils.resolve_process_path()
+ logger.debug("(path) process: `%s'", process)
environments = utils.find_environments(arguments['--environments'])
+ logger.debug("Environments: %s", ", ".join(environments))
+
+ worker = Worker.objects.get(name=arguments['--name'])
+
+ # check environments
+ missing, unused = worker.check_environments(environments)
+ if unused:
+ logger.info("The following environments where found on your " \
+ "setup, but will not be used with the current queue " \
+ "configuration: %s" % ", ".join(unused))
+ if missing:
+ raise RuntimeError("The following environments are currently " \
+ "missing from your setup: %s" % ", ".join(missing))
+ else:
+ logger.info("All required software environments were found")
timing = int(arguments['--period']) \
if arguments['--period'] else settings.WORKER_INTERVAL
logger.info("Working at `%s' every %d seconds", arguments['--name'], timing)
global stop
- with Worker.objects.get(name=arguments['--name']) as worker:
+ with worker:
while not stop:
diff --git a/todo.rst b/todo.rst
index 7a774ef1f..f3e5f87be 100644
--- a/todo.rst
+++ b/todo.rst
@@ -59,3 +59,9 @@ Experiments
* Make sure to remove any spurious logs from the beat.scheduler before
introducing stdout/stderr components to the experiment view
+
+
+Backend
+-------
+
+* Add proper e-mail queueing support
--
GitLab