projects
/
qcg-portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
postpone gridftp initialization (magical fix of uwsgi issues)
[qcg-portal.git]
/
qcg
/
service.py
diff --git
a/qcg/service.py
b/qcg/service.py
index
6658638
..
81b4ab4
100644
(file)
--- a/
qcg/service.py
+++ b/
qcg/service.py
@@
-2,6
+2,7
@@
import logging
import time
from django.db import transaction
import time
from django.db import transaction
+from django.utils.functional import SimpleLazyObject
from django.utils.timezone import now
from pyqcg import QCG
from pyqcg.description import JobDescription
from django.utils.timezone import now
from pyqcg import QCG
from pyqcg.description import JobDescription
@@
-50,7
+51,7
@@
def update_user_data(user, proxy):
**changed_filter)
tte = time.time()
**changed_filter)
tte = time.time()
- jobs_cache = {j.job_id: j for j in Job.objects.filter(owner=user)}
+ jobs_cache = SimpleLazyObject(lambda: {j.job_id: j for j in Job.objects.filter(owner=user)})
task_count = 0
for qcg_task in tasks:
params = Task.qcg_map(qcg_task, jobs_cache)
task_count = 0
for qcg_task in tasks:
params = Task.qcg_map(qcg_task, jobs_cache)
@@
-82,8
+83,6
@@
def update_user_data(user, proxy):
def submit_job(params, proxy):
def submit_job(params, proxy):
- # print params
-
QCG.start()
desc = JobDescription(Credential(proxy))
QCG.start()
desc = JobDescription(Credential(proxy))
@@
-104,7
+103,6
@@
def submit_job(params, proxy):
if params['watch_output']:
desc.set_watch_output(params['watch_output'], params['watch_output_pattern'])
# TODO script
if params['watch_output']:
desc.set_watch_output(params['watch_output'], params['watch_output_pattern'])
# TODO script
- # TODO stage_out
# TODO monitoring
# for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'):
# TODO monitoring
# for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'):
@@
-112,6
+110,6
@@
def submit_job(params, proxy):
# print desc.xml_description
# print desc.xml_description
- # job = desc.submit()
+ job = desc.submit()
- # return job.job_id
+ return job.job_id