diff --git a/cli/dcoscli/data/help/job.txt b/cli/dcoscli/data/help/job.txt index bf70619..8910585 100644 --- a/cli/dcoscli/data/help/job.txt +++ b/cli/dcoscli/data/help/job.txt @@ -10,7 +10,7 @@ Description: dcos job remove [--stop-current-job-runs] dcos job show dcos job update - dcos job kill [run-id][--all] + dcos job kill [][--all] dcos job run dcos job list [--json] dcos job schedule add diff --git a/cli/dcoscli/job/main.py b/cli/dcoscli/job/main.py index 536dc86..3b58e96 100644 --- a/cli/dcoscli/job/main.py +++ b/cli/dcoscli/job/main.py @@ -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