Changeset 2082 for trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

Timestamp:

06/23/09 11:35:41 (15 years ago)

Author:

svonolfe

Message:

Avoid out of memory exceptions related to job objects (#372)

File:

• trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

@@ -73 +73 @@
     public void ResetJobsDependingOnResults(Job job) {
       ISession session = factory.GetSessionForCurrentThread();
+      ITransaction tx = null;
 
       try {
@@ -78 +79 @@
             session.GetDataAdapter<Job, IJobAdapter>();
 
-        JobResult lastJobResult = GetLastJobResult(job);
-        if (lastJobResult != null) {
-          job.Percentage = lastJobResult.Percentage;
-          job.SerializedJob = lastJobResult.Result;
-        } else {
-          job.Percentage = 0;
-        }
-
-        job.Client = null;
-        job.State = State.offline;
-
-        jobAdapter.Update(job);
+        tx = session.BeginTransaction();
+
+        if (job != null) {
+          ComputableJob computableJob =
+              new ComputableJob();
+          computableJob.JobInfo =
+            job;
+
+          JobResult lastJobResult = GetLastJobResult(job);
+          if (lastJobResult != null) {
+            computableJob.JobInfo.Percentage = lastJobResult.Percentage;
+            computableJob.SerializedJob = lastJobResult.Result;
+
+            jobAdapter.UpdateComputableJob(computableJob);
+          } else {
+            computableJob.JobInfo.Percentage = 0;
+          }
+
+          computableJob.JobInfo.Client = null;
+          computableJob.JobInfo.State = State.offline;
+
+          jobAdapter.Update(computableJob.JobInfo);
+        }
+
+        tx.Commit();
+      }
+      catch (Exception ex) {
+        if (tx != null)
+          tx.Rollback();
+        throw ex;
       }
       finally {
@@ -185 +204 @@
     /// <param name="job"></param>
     /// <returns></returns>
-    public ResponseObject<Job> AddNewJob(Job job) {
+    public ResponseObject<Job> AddNewJob(ComputableJob job) {
       ISession session = factory.GetSessionForCurrentThread();
 
@@ -194 +213 @@
         ResponseObject<Job> response = new ResponseObject<Job>();
 
-        if (job != null) {
-          if (job.State != State.offline) {
+        if (job != null && job.JobInfo != null) {
+          if (job.JobInfo.State != State.offline) {
             response.Success = false;
             response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
             return response;
           }
-          if (job.Id != Guid.Empty) {
+          if (job.JobInfo.Id != Guid.Empty) {
             response.Success = false;
             response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
@@ -211 +230 @@
           }
 
-          job.DateCreated = DateTime.Now;
-          jobAdapter.Update(job);
+          job.JobInfo.DateCreated = DateTime.Now;
+          jobAdapter.UpdateComputableJob(job);
           response.Success = true;
-          response.Obj = job;
+          response.Obj = job.JobInfo;
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
         } else {