From 397dbfaffe8adf9ef571194dbf68ef5592dd665e Mon Sep 17 00:00:00 2001 From: Yan Li <1801213689@pku.edu.cn> Date: Sat, 10 Nov 2018 20:31:03 +0800 Subject: [PATCH] set priority in add_task --- src/master/jobmgr.py | 5 +++-- src/master/parser.py | 2 +- web/templates/batch/batch_create.html | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/master/jobmgr.py b/src/master/jobmgr.py index 31c0b4c..ae4e82a 100644 --- a/src/master/jobmgr.py +++ b/src/master/jobmgr.py @@ -11,6 +11,7 @@ class BatchJob(object): self.task_finished = [] self.job_id = None self.job_name = job_info['jobName'] + self.job_priority = int(job_info['jobPriority']) self.status = 'pending' self.create_time = time.strftime('%Y-%m-%d %H:%M:%S',time.localtime()) self.top_sort() @@ -83,7 +84,6 @@ class JobMgr(threading.Thread): # user: username # job_data: a json string # user submit a new job, add this job to queue and database - # call add_task to add task information def add_job(self, user, job_info): try: job = BatchJob(user, job_info) @@ -137,7 +137,8 @@ class JobMgr(threading.Thread): if not task_info: return False else: - self.taskmgr.add_task(job.user, task_name, task_info) + task_priority = self.job_priority + self.taskmgr.add_task(job.user, task_name, task_info, task_priority) return True # this is a thread to schedule the jobs diff --git a/src/master/parser.py b/src/master/parser.py index 4972296..9449383 100644 --- a/src/master/parser.py +++ b/src/master/parser.py @@ -1,7 +1,7 @@ #!/user/bin/python3 import json -job_data = {'image_1': 'base_base_base', 'mappingRemoteDir_2_2': 'sss', 'dependency_1': 'aaa', 'mappingLocalDir_2_1': 'xxx', 'mappingLocalDir_1_2': 'aaa', 'mappingLocalDir_1_1': 'aaa', 'mappingLocalDir_2_3': 'fdsffdf', 'mappingRemoteDir_1_1': 'ddd', 'mappingRemoteDir_2_3': 'sss', 'srcAddr_1': 'aaa', 'mappingSource_2_1': 'Aliyun', 'cpuSetting_1': '1', 'mappingSource_2_2': 'Aliyun', 'retryCount_2': '1', 'mappingSource_1_1': 'Aliyun', 'expTime_1': '60', 'diskSetting_2': '1024', 'diskSetting_1': '1024', 'dependency_2': 'ddd', 'memorySetting_1': '1024', 'command_2': 'ccc', 'mappingRemoteDir_1_2': 'ddd', 'gpuSetting_2': '0', 'memorySetting_2': '1024', 'gpuSetting_1': '0', 'mappingLocalDir_2_2': 'bbb', 'mappingSource_1_2': 'Aliyun', 'expTime_2': '60', 'mappingRemoteDir_2_1': 'vvv', 'srcAddr_2': 'fff', 'cpuSetting_2': '1', 'instCount_1': '1', 'mappingSource_2_3': 'Aliyun', 'token': 'ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbWxoZENJNk1UVXpNelE0TVRNMU5Td2laWGh3SWpveE5UTXpORGcwT1RVMWZRLmV5SnBaQ0k2TVgwLkF5UnRnaGJHZXhJY2lBSURZTUd5eXZIUVJnUGd1ZTA3OEtGWkVoejJVMkE=', 'instCount_2': '1', 'retryCount_1': '1', 'command_1': 'aaa', 'taskPriority': '0', 'image_2': 'base_base_base', 'jobName': 'aaa'} +job_data = {'image_1': 'base_base_base', 'mappingRemoteDir_2_2': 'sss', 'dependency_1': 'aaa', 'mappingLocalDir_2_1': 'xxx', 'mappingLocalDir_1_2': 'aaa', 'mappingLocalDir_1_1': 'aaa', 'mappingLocalDir_2_3': 'fdsffdf', 'mappingRemoteDir_1_1': 'ddd', 'mappingRemoteDir_2_3': 'sss', 'srcAddr_1': 'aaa', 'mappingSource_2_1': 'Aliyun', 'cpuSetting_1': '1', 'mappingSource_2_2': 'Aliyun', 'retryCount_2': '1', 'mappingSource_1_1': 'Aliyun', 'expTime_1': '60', 'diskSetting_2': '1024', 'diskSetting_1': '1024', 'dependency_2': 'ddd', 'memorySetting_1': '1024', 'command_2': 'ccc', 'mappingRemoteDir_1_2': 'ddd', 'gpuSetting_2': '0', 'memorySetting_2': '1024', 'gpuSetting_1': '0', 'mappingLocalDir_2_2': 'bbb', 'mappingSource_1_2': 'Aliyun', 'expTime_2': '60', 'mappingRemoteDir_2_1': 'vvv', 'srcAddr_2': 'fff', 'cpuSetting_2': '1', 'instCount_1': '1', 'mappingSource_2_3': 'Aliyun', 'token': 'ZXlKaGJHY2lPaUpJVXpJMU5pSXNJbWxoZENJNk1UVXpNelE0TVRNMU5Td2laWGh3SWpveE5UTXpORGcwT1RVMWZRLmV5SnBaQ0k2TVgwLkF5UnRnaGJHZXhJY2lBSURZTUd5eXZIUVJnUGd1ZTA3OEtGWkVoejJVMkE=', 'instCount_2': '1', 'retryCount_1': '1', 'command_1': 'aaa', 'jobPriority': '0', 'image_2': 'base_base_base', 'jobName': 'aaa'} def parse(job_data): job_info = {} diff --git a/web/templates/batch/batch_create.html b/web/templates/batch/batch_create.html index 63703b2..4248c30 100644 --- a/web/templates/batch/batch_create.html +++ b/web/templates/batch/batch_create.html @@ -48,7 +48,7 @@

-
{% for priority in range(10) %} {% endfor %}