m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #387 from GallenShao/master 

fix a bug when decoding image name_owner_type in taskmgr
This commit is contained in:
GallenShao 2019-05-14 16:34:00 +08:00 committed by GitHub
parent 2eb187c066 5925cf6764
commit 8758d94deb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/master/taskmgr.py
View File

@ -687,9 +687,9 @@ class TaskMgr(threading.Thread):
username = username, username = username,
vnode = VNode( vnode = VNode(
image = Image( image = Image(
name = json_task['image'].split('_')[0], #json_task['cluster']['image']['name'], name = '_'.join(json_task['image'].split('_')[:-2]), #json_task['cluster']['image']['name'],
type = image_dict[json_task['image'].split('_')[2]], #json_task['cluster']['image']['type'], type = image_dict[json_task['image'].split('_')[-1]], #json_task['cluster']['image']['type'],
owner = username if not json_task['image'].split('_')[1] else json_task['image'].split('_')[1]), #json_task['cluster']['image']['owner']), owner = username if not json_task['image'].split('_')[-2] else json_task['image'].split('_')[-2]), #json_task['cluster']['image']['owner']),
instance = Instance( instance = Instance(
cpu = int(json_task['cpuSetting']), cpu = int(json_task['cpuSetting']),
memory = int(json_task['memorySetting']), memory = int(json_task['memorySetting']),