Return and show task_name
This commit is contained in:
parent
9958d1cfe8
commit
9ab505ec98
|
@ -2458,7 +2458,7 @@ class API_VM_Locks(Resource):
|
||||||
task = run_celery_task(vm_flush_locks, domain=vm, run_on=vm_node)
|
task = run_celery_task(vm_flush_locks, domain=vm, run_on=vm_node)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": vm_node},
|
{"task_id": task.id, "task_name": "vm.flush_locks", "run_on": vm_node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -2593,7 +2593,7 @@ class API_VM_Device(Resource):
|
||||||
task = run_celery_task(vm_device_attach, domain=vm, xml=xml, run_on=vm_node)
|
task = run_celery_task(vm_device_attach, domain=vm, xml=xml, run_on=vm_node)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": vm_node},
|
{"task_id": task.id, "task_name": "vm.device_attach", "run_on": vm_node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -2647,7 +2647,7 @@ class API_VM_Device(Resource):
|
||||||
task = run_celery_task(vm_device_detach, domain=vm, xml=xml, run_on=vm_node)
|
task = run_celery_task(vm_device_detach, domain=vm, xml=xml, run_on=vm_node)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": vm_node},
|
{"task_id": task.id, "task_name": "vm.device_detach", "run_on": vm_node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -4404,7 +4404,11 @@ class API_Storage_Ceph_Benchmark(Resource):
|
||||||
run_benchmark, pool=reqargs.get("pool", None), run_on="primary"
|
run_benchmark, pool=reqargs.get("pool", None), run_on="primary"
|
||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": get_primary_node()},
|
{
|
||||||
|
"task_id": task.id,
|
||||||
|
"task_name": "storage.benchmark",
|
||||||
|
"run_on": get_primary_node(),
|
||||||
|
},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -4527,7 +4531,7 @@ class API_Storage_Ceph_OSDDB_Root(Resource):
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": node},
|
{"task_id": task.id, "task_name": "osd.add_db_vg", "run_on": node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -4732,7 +4736,7 @@ class API_Storage_Ceph_OSD_Root(Resource):
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": node},
|
{"task_id": task.id, "task_name": "osd.add", "run_on": node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -4852,7 +4856,7 @@ class API_Storage_Ceph_OSD_Element(Resource):
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": node},
|
{"task_id": task.id, "task_name": "osd.replace", "run_on": node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -4907,7 +4911,7 @@ class API_Storage_Ceph_OSD_Element(Resource):
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": node},
|
{"task_id": task.id, "task_name": "osd.refresh", "run_on": node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -4977,7 +4981,7 @@ class API_Storage_Ceph_OSD_Element(Resource):
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": node},
|
{"task_id": task.id, "task_name": "osd.remove", "run_on": node},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
@ -8508,7 +8512,11 @@ class API_Provisioner_Create_Root(Resource):
|
||||||
run_on="primary",
|
run_on="primary",
|
||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
{"task_id": task.id, "run_on": get_primary_node()},
|
{
|
||||||
|
"task_id": task.id,
|
||||||
|
"task_name": "provisioner.create",
|
||||||
|
"run_on": get_primary_node(),
|
||||||
|
},
|
||||||
202,
|
202,
|
||||||
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
{"Location": Api.url_for(api, API_Tasks_Element, task_id=task.id)},
|
||||||
)
|
)
|
||||||
|
|
|
@ -71,11 +71,12 @@ def wait_for_celery_task(CLI_CONFIG, task_detail, start_late=False):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
task_id = task_detail["task_id"]
|
task_id = task_detail["task_id"]
|
||||||
|
task_name = task_detail["task_name"]
|
||||||
|
|
||||||
if not start_late:
|
if not start_late:
|
||||||
run_on = task_detail["run_on"]
|
run_on = task_detail["run_on"]
|
||||||
|
|
||||||
echo(CLI_CONFIG, f"Task ID: {task_id} assigned to node {run_on}")
|
echo(CLI_CONFIG, f"Task ID: {task_id} ({task_name}) assigned to node {run_on}")
|
||||||
echo(CLI_CONFIG, "")
|
echo(CLI_CONFIG, "")
|
||||||
|
|
||||||
# Wait for the task to start
|
# Wait for the task to start
|
||||||
|
@ -100,7 +101,7 @@ def wait_for_celery_task(CLI_CONFIG, task_detail, start_late=False):
|
||||||
CLI_CONFIG, task_id=task_id, is_watching=True
|
CLI_CONFIG, task_id=task_id, is_watching=True
|
||||||
)
|
)
|
||||||
|
|
||||||
echo(CLI_CONFIG, f"Watching existing task {task_id}:")
|
echo(CLI_CONFIG, f"Watching existing task {task_id} ({task_name}):")
|
||||||
|
|
||||||
# Start following the task state, updating progress as we go
|
# Start following the task state, updating progress as we go
|
||||||
total_task = task_status.get("total")
|
total_task = task_status.get("total")
|
||||||
|
|
Loading…
Reference in New Issue