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

Timestamp:

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

Author:

svonolfe

Message:

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

Location:

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

Files:

• ClientCommunicator.cs (modified) (9 diffs)
• ExecutionEngineFacade.cs (modified) (1 diff)
• JobManager.cs (modified) (5 diffs)
• ServerConsoleFacade.cs (modified) (1 diff)

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

@@ -371 +371 @@
     /// <returns></returns>
     public ResponseJob SendJob(Guid clientId) {
-      ResponseJob response = new ResponseJob();
-
-      Job job2Calculate = scheduler.GetNextJobForClient(clientId);
-      if (job2Calculate != null) {
-        response.Job = job2Calculate;
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
-        lock (newAssignedJobs) {
-          newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
-        }
-      } else {
-        response.Success = false;
-        response.Job = null;
-        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
-      }
-      return response;
+       ISession session = factory.GetSessionForCurrentThread();
+      ITransaction tx = null;
+
+      try {
+        IJobAdapter jobAdapter =
+          session.GetDataAdapter<Job, IJobAdapter>();
+
+        tx = session.BeginTransaction();
+
+        ResponseJob response = new ResponseJob();
+
+        Job job2Calculate = scheduler.GetNextJobForClient(clientId);
+        if (job2Calculate != null) {
+          ComputableJob computableJob =
+            jobAdapter.GetComputableJob(job2Calculate.Id);
+
+          response.Job = computableJob;
+          response.Success = true;
+          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
+          lock (newAssignedJobs) {
+            newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
+          }
+        } else {
+          response.Success = false;
+          response.Job = null;
+          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
+        }
+
+        return response;
+      }
+      catch (Exception ex) {
+        if (tx != null)
+          tx.Rollback();
+        throw ex;
+      }
+      finally {
+        if (session != null)
+          session.EndSession();
+      }
     }
 
@@ -412 +435 @@
           clientAdapter.GetById(clientId);
 
-        Job job =
-          jobAdapter.GetById(jobId);
+        ComputableJob job =
+          new ComputableJob();
+
+        if (job != null) {
+          job.JobInfo =
+            jobAdapter.GetById(jobId);
+        }
         
-        if (job == null) {
+        if (job == null && job.JobInfo != null) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOB_WITH_THIS_ID;
@@ -421 +449 @@
           return response;
         }
-        if (job.State == State.abort) {
+        if (job.JobInfo.State == State.abort) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
         }
-        if (job.Client == null) {
+        if (job.JobInfo.Client == null) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
@@ -431 +459 @@
           return response;
         }
-        if (job.Client.Id != clientId) {
+        if (job.JobInfo.Client.Id != clientId) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_CLIENT_FOR_JOB;
@@ -437 +465 @@
           return response;
         }
-        if (job.State == State.finished) {
+        if (job.JobInfo.State == State.finished) {
           response.Success = true;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
@@ -443 +471 @@
           return response;
         }
-        if (job.State == State.requestSnapshotSent) {
-          job.State = State.calculating;
-        }
-        if (job.State != State.calculating && job.State != State.pending) {
+        if (job.JobInfo.State == State.requestSnapshotSent) {
+          job.JobInfo.State = State.calculating;
+        }
+        if (job.JobInfo.State != State.calculating && 
+          job.JobInfo.State != State.pending) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
@@ -453 +482 @@
         }
         job.SerializedJob = result;
-        job.Percentage = percentage;
+        job.JobInfo.Percentage = percentage;
 
         if (finished) {
-          job.State = State.finished;
-          jobAdapter.Update(job);
-        }
-        List<JobResult> jobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
+          job.JobInfo.State = State.finished;
+          job.SerializedJob = result;
+        }
+
+        jobAdapter.UpdateComputableJob(job);
+
+        List<JobResult> jobResults = new List<JobResult>(
+          jobResultAdapter.GetResultsOf(job.JobInfo));
         foreach (JobResult currentResult in jobResults)
           jobResultAdapter.Delete(currentResult);
@@ -466 +499 @@
           new JobResult();
         jobResult.ClientId = client.Id;
-        jobResult.JobId = job.Id;
+        jobResult.JobId = job.JobInfo.Id;
         jobResult.Result = result;
         jobResult.Percentage = percentage;
@@ -473 +506 @@
 
         jobResultAdapter.Update(jobResult);
-        jobAdapter.Update(job);
+        jobAdapter.Update(job.JobInfo);
 
         response.Success = true;

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

@@ -36 +36 @@
     #region IExecutionEngineFacade Members
 
-    public ResponseObject<Job> AddJob(Job job) {
+    public ResponseObject<Job> AddJob(ComputableJob job) {
       return jobManager.AddNewJob(job);
     }

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 {

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

@@ -99 +99 @@
     }
 
-    public ResponseObject<Job> AddNewJob(Job job) {
-      secMan.Authorize("AddJob", sessionID, job.Id);
+    public ResponseObject<Job> AddNewJob(ComputableJob job) {
+      secMan.Authorize("AddJob", sessionID, job.JobInfo.Id);
       return jobManager.AddNewJob(job);
     }