Turn an assertion into a more useful error message.
Signed-off-by: Gregory Smith <gps@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3563 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index dc7f390..b7c2e6d 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -813,7 +813,10 @@
is_complete=False)
# Use ordering to force NULL queue_entry_id's to the end of the list
for task in tasks.order_by('-queue_entry__id'):
- assert not self.host_has_agent(task.host)
+ if self.host_has_agent(task.host):
+ raise SchedulerError(
+ "%s already has a host agent %s." % (
+ task, self._host_agents.get(host.id)))
host = Host(id=task.host.id)
queue_entry = None