From: Zack Cerza <zack@cerza.org>
Date: Mon, 14 Apr 2014 20:38:51 +0000 (-0500)
Subject: When killing a run, delete paddles jobs
X-Git-Tag: 1.1.0~1533^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=165f5d53454490208778b34b3fd87ce9070e901b;p=teuthology.git

When killing a run, delete paddles jobs

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/kill.py b/teuthology/kill.py
index e604b4de2..9f197dd8a 100755
--- a/teuthology/kill.py
+++ b/teuthology/kill.py
@@ -8,6 +8,7 @@ import subprocess
 import tempfile
 import logging
 
+from . import report
 from .config import config
 
 log = logging.getLogger(__name__)
@@ -44,6 +45,7 @@ def kill_run(run_name, archive_base=None, owner=None, machine_type=None,
 
     if not preserve_queue:
         remove_beanstalk_jobs(run_name, machine_type)
+        remove_paddles_jobs(run_name)
     kill_processes(run_name, run_info.get('pids'))
     if owner is not None:
         targets = find_targets(run_name, owner)
@@ -101,6 +103,14 @@ def find_job_info(job_archive_dir):
     return job_info
 
 
+def remove_paddles_jobs(run_name):
+    jobs = report.ResultsReporter().get_jobs(run_name, fields=['status'])
+    job_ids = [job['job_id'] for job in jobs if job['status'] == 'queued']
+    if job_ids:
+        log.info("Deleting jobs from paddles: %s", str(job_ids))
+        report.try_delete_jobs(run_name, job_ids)
+
+
 def remove_beanstalk_jobs(run_name, tube_name):
     qhost = config.queue_host
     qport = config.queue_port