Don't abort running entries from synch start timeout (only queued/starting/verifying/pending ones).
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2541 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 9b2dfe7..be516d1 100644
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -707,7 +707,10 @@
hostqueueentry__host__acl_group__name='Everyone')
for job in query.distinct():
print 'Aborting job %d due to start timeout' % job.id
- job.abort(None)
+ entries_to_abort = job.hostqueueentry_set.exclude(
+ status=models.HostQueueEntry.Status.RUNNING)
+ for queue_entry in entries_to_abort:
+ queue_entry.abort(None)
def _clear_inactive_blocks(self):