openstack/deb-sahara
Code Issues Proposed changes

Merge "Add updating jobs statuses before cluster deletion"

Browse Source
This commit is contained in:
Jenkins 2015-06-01 17:08:55 +00:00 committed by Gerrit Code Review
commit b095924e62
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sahara/service/edp/job_manager.py
View File

@ -189,9 +189,12 @@ def get_job_status(job_execution_id):
return job_execution
def update_job_statuses():
def update_job_statuses(cluster_id=None):
ctx = context.ctx()
for je in conductor.job_execution_get_all(ctx, end_time=None):
kwargs = {'end_time': None}
if cluster_id:
kwargs.update({'cluster_id': cluster_id})
for je in conductor.job_execution_get_all(ctx, **kwargs):
try:
get_job_status(je.id)
except Exception as e:

1
sahara/service/ops.py
View File

@ -305,6 +305,7 @@ def _provision_scaled_cluster(cluster_id, node_group_id_map):
_("Terminating cluster failed for the following reason(s): {reason}"))
def terminate_cluster(cluster_id):
ctx = context.ctx()
job_manager.update_job_statuses(cluster_id=cluster_id)
cluster = conductor.cluster_get(ctx, cluster_id)
plugin = plugin_base.PLUGINS.get_plugin(cluster.plugin_name)