diff --git a/src/master/jobmgr.py b/src/master/jobmgr.py index 476ec77..5097c03 100644 --- a/src/master/jobmgr.py +++ b/src/master/jobmgr.py @@ -360,7 +360,7 @@ class JobMgr(): if job.username != user: return [False, "Wrong User!"] jobdata = json.loads(str(job)) - tasks = job.tasks.all() + tasks = job.tasks.order_by(Batchtask.idx).all() tasksdata = [json.loads(str(t)) for t in tasks] jobdata['tasks'] = tasksdata return [True, jobdata] diff --git a/web/templates/batch/batch_create.html b/web/templates/batch/batch_create.html index 5f77c87..469f560 100644 --- a/web/templates/batch/batch_create.html +++ b/web/templates/batch/batch_create.html @@ -235,14 +235,14 @@ +'
CPU Cores | +Memory | +GPU | +Disk | +VNode Number | +Max Retry Times | +||||
---|---|---|---|---|---|---|---|---|---|
{{ task['config']['cpuSetting'] }} | +{{ task['config']['memorySetting'] }} MB | +{{ task['config']['gpuSetting'] }} | +{{ task['config']['diskSetting'] }} MB | +{{ task['config']['vnodeCount'] }} | +{{ task['config']['retryCount'] }} | +||||
Running Path | +Expire Time | +Stdout Redirect Path | +Stderr Redirect Path | +Dependency | +Command | +||||
{{ task['config']['srcAddr'] }} | +{{ task['config']['expTime'] }} seconds | +{{ task['config']['stdOutRedPth'] }} | +{{ task['config']['stdErrRedPth'] }} | +{{ task['config']['dependency'] }} | +{{ task['config']['command'] }} | +||||
Run on | +Start at the Same Time | +Image Name | +Image Owner | +Image Type | +|||||
all vnodes | + {% else %} +master vnode | + {% endif %} + {% if 'atSameTime' in task['config'].keys() %} +True | + {% else %} +False | + {% endif %} + {% if task['config']['image'] == 'base_base_base' %} +base | +docklet | +public | + {% else %} +{{ task['config']['image'].split('_')[0] }} | +{{ task['config']['image'].split('_')[1] }} | +{{ task['config']['image'].split('_')[2] }} | + {% endif %} +