openstack/deb-python-dcos
Code Issues Proposed changes

job: fix not being able to kill a running metronome job (#948)

Browse Source
This commit is contained in:
Johannes Unterstein
2017-03-23 17:53:36 +01:00
committed by tamarrow
parent 5226dfbf3c
commit 0a94d2b9d4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/dcoscli/data/help/job.txt
View File

@@ -10,7 +10,7 @@ Description:
dcos job remove <job-id> [--stop-current-job-runs]
dcos job show <job-id>
dcos job update <job-file>
dcos job kill <job-id> [run-id][--all]
dcos job kill <job-id> [<run-id>][--all]
dcos job run <job-id>
dcos job list [--json]
dcos job schedule add <job-id> <schedule-file>

8
cli/dcoscli/job/main.py
View File

@@ -216,7 +216,6 @@ def _kill(job_id, run_id, all=False):
:returns: process return code
:rtype: int
"""
response = None
deadpool = []
if run_id is None and all is True:
deadpool = _get_ids(_get_runs(job_id))
@@ -226,7 +225,7 @@ def _kill(job_id, run_id, all=False):
client = metronome.create_client()
for dead in deadpool:
try:
client.kill_run(job_id, run_id)
client.kill_run(job_id, dead)
except DCOSHTTPException as e:
if e.response.status_code == 404:
raise DCOSException("Job ID or Run ID does NOT exist.")
@@ -234,9 +233,8 @@ def _kill(job_id, run_id, all=False):
raise DCOSException("Unable stop run ID '{}' for job ID '{}'"
.format(dead, job_id))
else:
if response.status_code == 200:
emitter.publish("Run '{}' for job '{}' killed."
.format(dead, job_id))
emitter.publish("Run '{}' for job '{}' killed."
.format(dead, job_id))
return 0