update job attributes in job/task details view

[qcg-portal.git] / qcg / service.py

diff --git a/qcg/service.py b/qcg/service.py
index 81b4ab4..f950aac 100644 (file)
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -9,6 +9,8 @@ from pyqcg.description import JobDescription
 from pyqcg.service import Registry
 from pyqcg.utils import Credential, TimePeriod, JobStatus, TaskStatus
 
+from qcg.models import User, Job, Task, Allocation, NodeInfo
+
 
 logger = logging.getLogger(__name__)
 
@@ -17,15 +19,14 @@ logger = logging.getLogger(__name__)
 def update_user_data(user, proxy):
     ts = time.time()
     QCG.start()
-    from qcg.models import User, Job, Task, Allocation, NodeInfo
 
-    credential = Credential(proxy)
-    registry = Registry(credential)
+    registry = Registry(Credential(proxy))
 
     # put lock on user record (hopefully..?)
     user = User.objects.select_for_update().get(pk=user.pk)
+    last_update = user.last_update
 
-    changed_filter = {'changed': TimePeriod(after=user.last_update)}
+    changed_filter = {'changed': TimePeriod(after=last_update)}
 
     ###################################
     # Jobs
@@ -54,7 +55,7 @@ def update_user_data(user, proxy):
     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)
+        params = Task.qcg_map(qcg_task, jobs_cache[qcg_task.job_id])
         task_id = params.pop('task_id')
 
         task, created = Task.objects.update_or_create(job__job_id=qcg_task.job_id, task_id=task_id, defaults=params)
@@ -78,8 +79,58 @@ def update_user_data(user, proxy):
     elapsed_jobs = jte - jts
     elapsed_tasks = tte - tts
     elapsed_py = elapsed - elapsed_jobs - elapsed_tasks
-    logger.info('(%.3f) USER = %s, JOBS = %s (%.3f), TASKS = %s (%.3f), TIME = %.3f',
-                elapsed, user, jobs_count, elapsed_jobs, task_count, elapsed_tasks, elapsed_py)
+    logger.info('(%.3f) USER = %s, LAST_UPDATE = %s, JOBS = %s (%.3f), TASKS = %s (%.3f), TIME = %.3f',
+                elapsed, user, last_update, jobs_count, elapsed_jobs, task_count, elapsed_tasks, elapsed_py)
+
+
+@transaction.atomic
+def update_job(job, proxy):
+    if job.get_status_display() in [JobStatus.FINISHED, JobStatus.FAILED, JobStatus.CANCELED]:
+        return
+
+    ts = time.time()
+    QCG.start()
+
+    credential = Credential(proxy)
+    qcg_job = job.qcg_job
+    qcg_job.credential = credential
+
+    jts = time.time()
+    qcg_job.refresh_information()
+    elapsed_job = time.time() - jts
+
+    for name, val in job.qcg_map(qcg_job, job.owner).iteritems():
+        if getattr(job, name) != val:
+            setattr(job, name, val)
+
+    job.save()
+
+    elapsed_tasks = 0
+    for task in job.tasks.all():
+        qcg_task = task.qcg_task
+        qcg_task.credential = credential
+
+        tts = time.time()
+        qcg_task.refresh_information()
+        elapsed_tasks += time.time() - tts
+
+        for name, val in task.qcg_map(qcg_task, task.job).iteritems():
+            if getattr(task, name) != val:
+                setattr(task, name, val)
+
+        task.save()
+        task.allocations.all().delete()
+
+        for qcg_alloc in qcg_task.allocations:
+            alloc = task.allocations.create(**Allocation.qcg_map(qcg_alloc))
+
+            for qcg_node in qcg_alloc.nodes:
+                alloc.nodes.create(**NodeInfo.qcg_map(qcg_node))
+
+    elapsed = time.time() - ts
+    elapsed_py = elapsed - elapsed_job - elapsed_tasks
+    logger.info('(%.3f) JOB = %s (%.3f), TASKS = %d (%.3f), TIME = %.3f',
+                elapsed, job.job_id, elapsed_job, job.tasks.count(), elapsed_tasks, elapsed_py)
 
 
 def submit_job(params, proxy):