Changeset 2082

Timestamp:

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

Author:

svonolfe

Message:

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

Location:

trunk/sources

Files:

• HeuristicLab.DataAccess.ADOHelper/3.2/DataAdapterBase.cs (modified) (7 diffs)
• HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ComputableJob.cs (added)
• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/Job.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/Interfaces/IExecutionEngineFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/Interfaces/IJobManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/ResponseJob.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/WcfSettings.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.Console/3.2/AddJobForm.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (9 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ExecutionEngineFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.DataAccess/3.2/IJobAdapter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2/DataAdapterBase.cs ¶

@@ -82 +82 @@
 
     protected delegate IEnumerable<RowT> Selector();
+    protected delegate object TransactionalAction();
 
     protected ObjT Convert(RowT row, ObjT obj) {
@@ -109 +110 @@
 
     protected ObjT FindSingle(Selector selector) {
-      ITransaction trans =
-       session.GetCurrentTransaction();
-      bool transactionExists = trans != null;
-      if (!transactionExists) {
-        trans = session.BeginTransaction();
-      }
-
-      try {
-        RowT row = FindSingleRow(selector);
-
-        ObjT result;
-        if (row != null) {
-          ObjT obj = new ObjT();
-          obj = Convert(row, obj);
-
-          result = obj;
-        } else {
-          result = default(ObjT);
-        }
-
-        return result;
-      }
-      finally {
-        if (!transactionExists && trans != null) {
-          trans.Commit();
-        }
-      }
+      return 
+        (ObjT)doInTransaction(
+         delegate() {
+          RowT row = FindSingleRow(selector);
+
+          ObjT result;
+          if (row != null) {
+            ObjT obj = new ObjT();
+            obj = Convert(row, obj);
+
+            result = obj;
+          } else {
+            result = default(ObjT);
+          }
+
+          return result;
+        });
     }
 
     private ICollection<ObjT> FindMultiple(Selector selector, 
       int from, int size) {
-      ITransaction trans =
-       session.GetCurrentTransaction();
-      bool transactionExists = trans != null;
-      if (!transactionExists) {
-        trans = session.BeginTransaction();
-      }
-
-      try {
-        IEnumerable<RowT> found =
-          selector();
-
-        if (from > 0 && size > 0)
-          found = found.Skip<RowT>(from).Take<RowT>(size);
-
-        IList<ObjT> result =
-          new List<ObjT>();
-
-        foreach (RowT row in found) {
-          ObjT obj = new ObjT();
-          obj = Convert(row, obj);
-          if (obj != null)
-            result.Add(obj);
-        }
-
-        return result;
-      }
-      finally {
-        if (!transactionExists && trans != null) {
-          trans.Commit();
-        }
-      }     
+      return (ICollection<ObjT>)doInTransaction(
+        delegate() {
+          IEnumerable<RowT> found =
+            selector();
+
+          if (from > 0 && size > 0)
+            found = found.Skip<RowT>(from).Take<RowT>(size);
+
+          IList<ObjT> result =
+            new List<ObjT>();
+
+          foreach (RowT row in found) {
+            ObjT obj = new ObjT();
+            obj = Convert(row, obj);
+            if (obj != null)
+              result.Add(obj);
+          }
+
+          return result;
+        });   
     }
 
@@ -185 +165 @@
     }
 
-    protected virtual void doUpdate(ObjT obj) {
-      if (obj != null) {
-        RowT row = null;
-
-        if (obj.Id != Guid.Empty) {
-          row = GetRowById(obj.Id);
-        } else {
-          obj.Id = Guid.NewGuid();
-        }
-
-        if (row == null) {
-          row = dataAdapter.InsertNewRow(obj);
-        }
-
-        ConvertObj(obj, row);
-        dataAdapter.UpdateRow(row);
-      }
-    }
-
-    public void Update(ObjT obj) {
+    protected object doInTransaction(TransactionalAction action) {
       ITransaction trans =
         session.GetCurrentTransaction();
@@ -213 +174 @@
 
       try {
-        doUpdate(obj);
+        bool result = (bool)action();
+
+        if (!transactionExists && trans != null) {
+            trans.Commit();
+        }
+
+        return result;
+      }
+      catch (Exception e) {
+        if (!transactionExists && trans != null) {
+          trans.Rollback();
+        }
+
+        throw e;
+      }
+    }
+
+    protected virtual void doUpdate(ObjT obj) {
+      if (obj != null) {
+        RowT row = null;
+
+        if (obj.Id != Guid.Empty) {
+          row = GetRowById(obj.Id);
+        } else {
+          obj.Id = Guid.NewGuid();
+        }
+
+        if (row == null) {
+          row = dataAdapter.InsertNewRow(obj);
+        }
+
+        ConvertObj(obj, row);
+        dataAdapter.UpdateRow(row);
+      }
+    }
+
+    public void Update(ObjT obj) {
+      try {
+        doInTransaction(
+          delegate() {
+            doUpdate(obj);
+            return true;
+          });        
       }
       catch (DBConcurrencyException ex) {
@@ -234 +237 @@
         //otherwise: row was deleted in the meantime - nothing to do
       }
-      finally {
-        if (!transactionExists && trans != null) {
-          trans.Commit();
-        }
-      }
     }
 
@@ -282 +280 @@
 
     public bool Delete(ObjT obj) {
-      ITransaction trans =
-        session.GetCurrentTransaction();
-      bool transactionExists = trans != null;
-      if (!transactionExists) {
-        trans = session.BeginTransaction();
-      }
-
       try {
-        return doDelete(obj);
+        return (bool)doInTransaction(
+          delegate() {
+            return doDelete(obj);
+          });
       }
       catch (DBConcurrencyException) {
@@ -303 +297 @@
         }
       }
-      finally {
-        if (!transactionExists && trans != null) {
-          trans.Commit();
-        }
-      }  
     }
   }

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs ¶

@@ -89 +89 @@
     }
 
-    private HeuristicLab.Hive.Contracts.BusinessObjects.Job CreateJobObj(byte[] serializedEngine) {
+    private HeuristicLab.Hive.Contracts.BusinessObjects.ComputableJob CreateJobObj(byte[] serializedEngine) {
       HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
 
@@ -111 +111 @@
       stream.Close();
 
-      jobObj.SerializedJob = memStream.ToArray();
+      ComputableJob computableJob =
+        new ComputableJob();
+      computableJob.SerializedJob = memStream.ToArray();
       jobObj.CoresNeeded = 1;
       jobObj.PluginsNeeded = requiredPlugins;
       jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
-      return jobObj;
+
+      computableJob.JobInfo = jobObj;
+
+      return computableJob;
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs ¶

@@ -297 +297 @@
         bool sandboxed = false;
         List<byte[]> files = new List<byte[]>();
-        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
+        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.JobInfo.PluginsNeeded))
           files.AddRange(plugininfo.PluginFiles);
-        
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
+
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.JobInfo.Id.ToString(), sandboxed, null, files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-        lock (engines) {                    
-          if (!jobs.ContainsKey(e.Result.Job.Id)) {
-            jobs.Add(e.Result.Job.Id, e.Result.Job);
-            appDomains.Add(e.Result.Job.Id, appDomain);
+        lock (engines) {
+          if (!jobs.ContainsKey(e.Result.Job.JobInfo.Id)) {
+            jobs.Add(e.Result.Job.JobInfo.Id, e.Result.Job.JobInfo);
+            appDomains.Add(e.Result.Job.JobInfo.Id, appDomain);
 
             Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-            engine.JobId = e.Result.Job.Id;
+            engine.JobId = e.Result.Job.JobInfo.Id;
             engine.Queue = MessageQueue.GetInstance();            
             engine.Start(e.Result.Job.SerializedJob);
-            engines.Add(e.Result.Job.Id, engine);
+            engines.Add(e.Result.Job.JobInfo.Id, engine);
 
             ClientStatusInfo.JobsFetched++;

trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/Job.cs ¶

@@ -44 +44 @@
     public double Percentage { get; set; }
     [DataMember]
-    public byte[] SerializedJob { get; set; }
-    [DataMember]
     public DateTime DateCreated { get; set; }
     [DataMember]

trunk/sources/HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj ¶

@@ -89 +89 @@
     <Compile Include="BusinessObjects\CachedHivePluginInfo.cs" />
     <Compile Include="BusinessObjects\ClientGroup.cs" />
+    <Compile Include="BusinessObjects\ComputableJob.cs" />
     <Compile Include="BusinessObjects\Project.cs" />
     <Compile Include="BusinessObjects\HivePluginInfo.cs" />

trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IExecutionEngineFacade.cs ¶

@@ -31 +31 @@
   public interface IExecutionEngineFacade {
     [OperationContract]
-    ResponseObject<Job> AddJob(Job job);
+    ResponseObject<Job> AddJob(ComputableJob job);
     [OperationContract]
     Response RequestSnapshot(Guid jobId);

trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IJobManager.cs ¶

@@ -38 +38 @@
     ResponseObject<Job> GetJobById(Guid jobId);
     [OperationContract]
-    ResponseObject<Job> AddNewJob(Job job);
+    ResponseObject<Job> AddNewJob(ComputableJob job);
     [OperationContract]
     Response RemoveJob(Guid jobId);

trunk/sources/HeuristicLab.Hive.Contracts/3.2/ResponseJob.cs ¶

@@ -37 +37 @@
   public class ResponseJob : Response {
     [DataMember]
-    public Job Job { get; set; }
+    public ComputableJob Job { get; set; }
   }
 }

trunk/sources/HeuristicLab.Hive.Contracts/3.2/WcfSettings.cs ¶

@@ -25 +25 @@
       NetTcpBinding binding = new NetTcpBinding();
 #endif
-      binding.MaxBufferSize = int.MaxValue;
+      /*binding.MaxBufferSize = int.MaxValue;
       binding.MaxReceivedMessageSize = int.MaxValue;
       binding.ReaderQuotas.MaxArrayLength = int.MaxValue;
-      binding.ReaderQuotas.MaxStringContentLength = int.MaxValue;
+      binding.ReaderQuotas.MaxStringContentLength = int.MaxValue;*/
       binding.CloseTimeout = new TimeSpan(0, 5, 0);
       binding.ReceiveTimeout = new TimeSpan(0, 5, 0);

trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs ¶

@@ -193 +193 @@
     }
 
-    private HeuristicLab.Hive.Contracts.BusinessObjects.Job CreateJobObj() {
-      HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
+    private HeuristicLab.Hive.Contracts.BusinessObjects.ComputableJob CreateJobObj() {
+      HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = 
+        new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
 
       MemoryStream memStream = new MemoryStream();
@@ -205 +206 @@
       document.Save(stream);
       stream.Close();
-      jobObj.SerializedJob = memStream.ToArray();
+
+      HeuristicLab.Hive.Contracts.BusinessObjects.ComputableJob executableJobObj =
+        new HeuristicLab.Hive.Contracts.BusinessObjects.ComputableJob();
+      executableJobObj.JobInfo = jobObj;
+      executableJobObj.SerializedJob = memStream.ToArray();
 
       DiscoveryService service = new DiscoveryService();
@@ -234 +239 @@
       jobObj.PluginsNeeded = pluginsNeeded;
       jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
-      return jobObj;
+      return executableJobObj;
     }
 

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientAdapter.cs ¶

@@ -189 +189 @@
 
     public ClientInfo GetByName(string name) {
-      ClientInfo client = new ClientInfo();
-      Resource res =
-        ResAdapter.GetByName(name);
-
-      return GetById(res.Id);
+      return (ClientInfo)
+        base.doInTransaction(
+        delegate() {
+          ClientInfo client = new ClientInfo();
+          Resource res =
+            ResAdapter.GetByName(name);
+
+          return GetById(res.Id);
+        });
     }
 
     protected override bool doDelete(ClientInfo client) {
-      bool success = false;
-      
-      if (client != null) {
-        dsHiveServer.ClientRow row =
-          GetRowById(client.Id);
-
-        if (row != null) {
-          success = base.doDelete(client) && 
-            ResAdapter.Delete(client);
-        }
-      }
-
-      return success;
+      return (bool)base.doInTransaction(
+        delegate() {
+          bool success = false;
+
+          if (client != null) {
+            dsHiveServer.ClientRow row =
+              GetRowById(client.Id);
+
+            if (row != null) {
+              success = base.doDelete(client) &&
+                ResAdapter.Delete(client);
+            }
+          }
+
+          return success;
+        });
     }
 

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs ¶

@@ -166 +166 @@
           job.Percentage = 0.0;
 
-        if (!row.IsSerializedJobNull())
-          job.SerializedJob = row.SerializedJob;
-        else
-          job.SerializedJob = null;
-
         if (!row.IsDateCreatedNull())
           job.DateCreated = row.DateCreated;
@@ -255 +250 @@
 
         row.Percentage = job.Percentage;
-
-        row.SerializedJob = job.SerializedJob;
 
         if (job.DateCreated != DateTime.MinValue)
@@ -422 +415 @@
     }
 
+    /// <summary>
+    /// Gets the computable job with the secified jobId
+    /// </summary>
+    /// <param name="jobId"></param>
+    /// <returns></returns>
+    public ComputableJob GetComputableJob(Guid jobId) {
+      return (ComputableJob)base.doInTransaction(
+        delegate() {
+          ComputableJob job =
+            new ComputableJob();
+
+          job.JobInfo = GetById(jobId);
+          dsHiveServer.JobRow row
+            = GetRowById(jobId);
+
+          if (job.JobInfo != null && row != null &&
+            !row.IsSerializedJobNull()) {
+
+            job.SerializedJob =
+              row.SerializedJob;
+
+            return job;
+          } else {
+            return null;
+          }
+        });
+    }
+
+    /// <summary>
+    /// Saves or update the computable job
+    /// </summary>
+    /// <param name="jobId"></param>
+    public void UpdateComputableJob(ComputableJob job) {
+      if(job != null && 
+        job.JobInfo != null) {
+        base.doInTransaction(
+          delegate() {
+            dsHiveServer.JobRow row
+              = GetRowById(job.JobInfo.Id);
+
+            if (row != null) {
+              Update(job.JobInfo);
+              row.SerializedJob =
+                job.SerializedJob;
+
+              base.Adapter.Update(row);
+            }
+
+            return true;
+          });
+      }
+      
+    }
+
     #endregion
   }

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/AddJobForm.cs ¶

@@ -128 +128 @@
               job.AssignedResourceIds = groupsToCalculate;
             }
-            job.SerializedJob = PersistenceManager.SaveToGZip(new TestJob());
-            Response resp = jobManager.AddNewJob(job);
+
+            ComputableJob computableJob =
+              new ComputableJob();
+            computableJob.JobInfo = job;
+            computableJob.SerializedJob = PersistenceManager.SaveToGZip(new TestJob());
+            Response resp = jobManager.AddNewJob(computableJob);
           }
           if (addJobEvent != null) {

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);
     }

trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IJobAdapter.cs ¶

@@ -80 +80 @@
     /// <returns></returns>
     ICollection<Job> GetJobsByProject(Guid projectId);
+
+    /// <summary>
+    /// Gets the computable job with the secified jobId
+    /// </summary>
+    /// <param name="jobId"></param>
+    /// <returns></returns>
+    ComputableJob GetComputableJob(Guid jobId);
+
+    /// <summary>
+    /// Saves or update the computable job
+    /// </summary>
+    /// <param name="jobId"></param>
+    void UpdateComputableJob(ComputableJob job);
   }
 }