Changeset 3931 for branches/3.2/sources/HeuristicLab.Hive.Server.Core

Timestamp:

06/19/10 09:17:24 (14 years ago)

Author:

kgrading

Message:

added minor speedups and better transaction handling to the server (#828)

Location:

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

Files:

• ClientCommunicator.cs (modified) (5 diffs)
• ClientFacade.cs (modified) (1 diff)
• DbTestApp.cs (modified) (10 diffs)
• InternalInterfaces/IInternalJobManager.cs (modified) (1 diff)
• JobManager.cs (modified) (14 diffs)

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

@@ -120 +120 @@
                 Logger.Info("Client timed out and is on RESET");
                 foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
-                  jobManager.ResetJobsDependingOnResults(job);
+                  DaoLocator.JobDao.SetJobOffline(job);
                   lock (newAssignedJobs) {
                     if (newAssignedJobs.ContainsKey(job.Id))
@@ -149 +149 @@
               lastHeartbeats.Remove(client.Id);
             foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
-              jobManager.ResetJobsDependingOnResults(job);
+              DaoLocator.JobDao.SetJobOffline(job);
             }
             heartbeatLock.ExitWriteLock();
@@ -428 +428 @@
       JobDto job2Calculate = scheduler.GetNextJobForClient(clientId);
       if (job2Calculate != null) {
-        response.Job = job2Calculate;
+        response.Job = job2Calculate;        
         response.Job.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Job);
         response.Success = true;
@@ -481 +481 @@
 
       if (response.Success) {
-        jobStream = DaoLocator.JobDao.GetSerializedJobStream(result.JobId);
-
+        Logger.Debug("Trying to aquire WCF Job Stream");
+        //jobStream = DaoLocator.JobDao.GetSerializedJobStream(result.JobId);
+        //Logger.Debug("Job Stream Aquired");
         byte[] buffer = new byte[3024];
+        List<byte> serializedJob = new List<byte>();
         int read = 0;
-        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
-          jobStream.Write(buffer, 0, read);
-        }
-        jobStream.Close();
+        int i = 0;        
+        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {          
+          for (int j = 0; j < read; j++) {
+            serializedJob.Add(buffer[j]);
+          }
+          if (i% 100 == 0)
+            Logger.Debug("Writing to stream: " + i);         
+          //jobStream.Write(buffer, 0, read);
+          i++;
+        }
+        Logger.Debug("Done Writing, closing the stream!");               
+        //jobStream.Close();
+
+        DaoLocator.JobDao.SetBinaryJobFile(result.JobId, serializedJob.ToArray());
       }
       Logger.Info("END Job received for Storage:");
+      stream.Dispose();
       return response;
     }
@@ -656 +669 @@
         foreach (JobDto job in jobsOfClient) {
           if (job.State != State.finished)
-            jobManager.ResetJobsDependingOnResults(job);
+            DaoLocator.JobDao.SetJobOffline(job);
         }
       }

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs

@@ -114 +114 @@
       IJobManager jobManager = 
         ServiceLocator.GetJobManager();
-
+      IInternalJobManager internalJobManager = (IInternalJobManager) jobManager;
+      
       //second stream the job binary data
-      
+      MemoryStream memoryStream = new MemoryStream();      
       if(job.Job != null)
-        stream.AddStream(
-          ((IInternalJobManager) (jobManager)).
-            GetJobStreamById(
-            job.Job.Id));
+        stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Job.Id)));
       
       OperationContext clientContext = OperationContext.Current;

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/DbTestApp.cs

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
@@ -37 +39 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using System.Transactions;
+using System.Threading;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server {
   [Application("Hive DB Test App", "Test Application for the Hive DataAccess Layer")]
-  class HiveDbTestApplication : ApplicationBase {
+  internal class HiveDbTestApplication : ApplicationBase {
     /*private void TestJobStreaming() {
       ISessionFactory factory =
@@ -111 +115 @@
     } */
 
-    ClientDao clientDao = new ClientDao();
-    ClientGroupDao cgd = new ClientGroupDao();
-
-    private void TestLINQImplementation() {      
-      
-      
+    private ClientDao clientDao = new ClientDao();
+    private ClientGroupDao cgd = new ClientGroupDao();
+
+    private void TestLINQImplementation() {
       ClientDto c1 = new ClientDto();
       c1.Id = Guid.NewGuid();
@@ -143 +145 @@
       c2 = clientDao.Insert(c2);
 
-      //ClientDto info2 = clientDao.FindById(info.Id);
-      //Console.WriteLine(info2);
-      
       ClientGroupDto tg = new ClientGroupDto();
       tg.Name = "TopGroup";
@@ -174 +173 @@
 
       List<ClientGroupDto> list = new List<ClientGroupDto>(cgd.FindAllWithSubGroupsAndClients());
-      
+
       cgd.RemoveRessourceFromClientGroup(sg.Id, tg.Id);
 
@@ -181 +180 @@
       clientDao.Delete(c1);
       clientDao.Delete(c2);
-
     }
 
@@ -220 +218 @@
         sg = cgd.Insert(sg);
         cgd.AddRessourceToClientGroup(sg.Id, mg.Id);
-        populateMainGroup(sg, p-1);
-      }
-
-      
-    }
-
+        populateMainGroup(sg, p - 1);
+      }
+    }
 
 
@@ -235 +230 @@
       //TestJobResultDeserialization();
 
+      //if (ContextFactory.Context.DatabaseExists())
+      //  ContextFactory.Context.DeleteDatabase();
+      //ContextFactory.Context.CreateDatabase();
       //TestLINQImplementation();
+      TestLinqFileHandling();
       //StressTest();
 
       //SpeedTest();
       //TestJobBytearrFetching();
-      TestJobStreamFetching();
-
-    }
-
-    private void TestJobStreamFetching() {
+      //TestJobStreamFetching();
+    }
+
+    private void WriteToJobWithByte(object jobid) {
+      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                                                           new TransactionOptions
+                                                           {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})
+        ) {
+        Logger.Info("starting bytestuff for job " + jobid);
+        DaoLocator.JobDao.SetBinaryJobFile((Guid)jobid, jobmap[(Guid)jobid]);
+        scope.Complete();
+        Logger.Info("ended bytestuff for job " + jobid);
+      }
+    }
+
+    private void UpdateJobStatus(object jobid) {
+      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                                                           new TransactionOptions
+                                                           {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})
+        ) {
+        Thread.Sleep(1500);
+        Logger.Info("starting now");
+        JobDto job = DaoLocator.JobDao.FindById((Guid)jobid);
+        job.Percentage = new Random().NextDouble();
+        DaoLocator.JobDao.Update(job);
+        scope.Complete();
+        Logger.Info("ended");
+      }
+    }
+
+    Dictionary<Guid, byte[]> jobmap = new Dictionary<Guid, byte[]>();
+
+
+    private void TestLinqFileHandling() {
+      List<Thread> jobupdateThreads = new List<Thread>();
+      List<Thread> jobProgressThreads = new List<Thread>();
+      
+      Random r = new Random();
+      Stack<JobDto> jobs = new Stack<JobDto>(DaoLocator.JobDao.FindAll());
+      Logger.Info("Fetched jobs");
+      for (int x = 0; x < 10 && jobs.Count > 0; x++ ) {
+        Logger.Info("Creating data for Job");
+        JobDto job = jobs.Pop();
+        byte[] jobarr = new byte[50*1024*1024];
+        for (int i = 0; i < jobarr.Length; i++) {
+          jobarr[i] = (byte) r.Next(255);
+        }
+        jobmap.Add(job.Id, jobarr);
+      }
+      Logger.Info("filled");
+      foreach(KeyValuePair<Guid, byte[]> kvp in jobmap) {
+        Thread tjob = new Thread(new ParameterizedThreadStart(WriteToJobWithByte));      
+        Thread tupdate = new Thread(new ParameterizedThreadStart(UpdateJobStatus));
+        jobupdateThreads.Add(tupdate);
+        jobProgressThreads.Add(tjob);
+        tupdate.Start(kvp.Key);
+        tjob.Start(kvp.Key);
+      }
+      foreach (Thread t in jobupdateThreads) {
+        t.Join();
+      }
+      foreach (Thread t in jobProgressThreads) {
+        t.Join();
+      }
+    }
+
+
+    private
+      void TestJobStreamFetching() {
       //using (TransactionScope scope = new TransactionScope()) {
+
       HiveDataContext context = ContextFactory.Context;
 
-      ContextFactory.Context.Connection.Open();
-      ContextFactory.Context.Transaction = ContextFactory.Context.Connection.BeginTransaction();
-      
+      ContextFactory.Context.Connection.Open
+        ();
+      ContextFactory.Context.Transaction
+        =
+        ContextFactory.Context.Connection.BeginTransaction
+          ();
+
+
       ClientFacade facade = new ClientFacade();
+
       Stream stream = facade.SendStreamedJob(new Guid("F5CFB334-66A0-417C-A585-71711BA21D3F"));
-      
+
+
       byte[] buffer = new byte[3024];
+
       int read = 0;
-      
-      while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {}
-      
-      stream.Close();
+
+      while ((
+               read
+               =
+               stream.Read
+                 (
+                 buffer
+                 , 0,
+                 buffer.Length
+                 )) > 0) {}
+
+      stream.Close
+        ();
 
       //Stream stream = DaoLocator.JobDao.GetSerializedJobStream(new Guid("bbb51f87-4e2f-4499-a9b6-884e589c78b6"));
@@ -265 +346 @@
     }
 
-    private void TestJobBytearrFetching() {
+    private
+      void TestJobBytearrFetching() {
       byte[] arr = DaoLocator.JobDao.GetBinaryJobFile(new Guid("A3386907-2B3C-4976-BE07-04D660D40A5B"));
-      Console.WriteLine(arr);
-    }
-
-    private void SpeedTest() {
+      Console.WriteLine
+        (
+        arr
+        );
+    }
+
+    private
+      void SpeedTest() {
       DateTime start = new DateTime();
+
       List<ClientGroupDto> list = new List<ClientGroupDto>(cgd.FindAllWithSubGroupsAndClients());
+
       DateTime end = new DateTime();
+
       TimeSpan used = end - start;
-      Console.WriteLine(used.TotalMilliseconds);
-    }
-
-
+      Console.WriteLine
+        (
+        used.TotalMilliseconds
+        );
+    }
   }
 }

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/InternalInterfaces/IInternalJobManager.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Hive.Server.Core.InternalInterfaces {
-  interface IInternalJobManager {
-    void ResetJobsDependingOnResults(JobDto job);
-
+  interface IInternalJobManager {   
     Stream GetJobStreamById(Guid jobId);
+    byte[] GetSerializedJobDataById(Guid jobId);
+    void SetSerializedJobDataById(Guid jobId, byte[] data);
   }
 }

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

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
@@ -38 +40 @@
 
 namespace HeuristicLab.Hive.Server.Core {
-  class JobManager: IJobManager, IInternalJobManager {
-
+  internal class JobManager : IJobManager, IInternalJobManager {
     //ISessionFactory factory;
-    ILifecycleManager lifecycleManager;
+    private ILifecycleManager lifecycleManager;
 
     #region IJobManager Members
@@ -53 +54 @@
     }
 
-    private JobDto GetLastJobResult(Guid jobId) {     
+    private JobDto GetLastJobResult(Guid jobId) {
       return DaoLocator.JobDao.FindById(jobId);
     }
 
-    public void ResetJobsDependingOnResults(JobDto job) {
-      Logger.Info("Setting job " + job.Id + " offline");
-      if (job != null) {
-        DaoLocator.JobDao.SetJobOffline(job);
-      }
-    }
-         
-
-    void checkForDeadJobs() {
+
+    private void checkForDeadJobs() {
       Logger.Info("Searching for dead Jobs");
-      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
+      using (
+        TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                                                      new TransactionOptions
+                                                      {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})) {
         List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
         foreach (JobDto curJob in allJobs) {
-          if (curJob.State != State.calculating) {
-            ResetJobsDependingOnResults(curJob);
+          if (curJob.State != State.calculating && curJob.State != State.finished) {
+            DaoLocator.JobDao.SetJobOffline(curJob);
           }
         }
@@ -79 +76 @@
     }
 
-    void lifecycleManager_OnStartup(object sender, EventArgs e) {
+    private void lifecycleManager_OnStartup(object sender, EventArgs e) {
+      Logger.Info("Startup Event Fired, Checking DB for consistency");
       checkForDeadJobs();
-    }
-
-    void lifecycleManager_OnShutdown(object sender, EventArgs e) {
+      Logger.Info("Startup Event Done");
+    }
+
+    private void lifecycleManager_OnShutdown(object sender, EventArgs e) {
+      Logger.Info("Startup Event Fired, Checking DB for consistency");
       checkForDeadJobs();
+      Logger.Info("Startup Event Done");
     }
 
@@ -92 +93 @@
     /// <returns></returns>
     public ResponseList<JobDto> GetAllJobs() {
-         ResponseList<JobDto> response = new ResponseList<JobDto>();
-
-         response.List = new List<JobDto>(DaoLocator.JobDao.FindAll());
-         response.Success = true;
-         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
-
-         return response;
+      ResponseList<JobDto> response = new ResponseList<JobDto>();
+
+      response.List = new List<JobDto>(DaoLocator.JobDao.FindAll());
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
+
+      return response;
     }
 
@@ -105 +106 @@
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
       return response;
-    }  
+    }
 
     /// <summary>
@@ -112 +113 @@
     /// <param name="jobId"></param>
     /// <returns></returns>
-    public Stream GetJobStreamById(Guid jobId) {           
+    public Stream GetJobStreamById(Guid jobId) {
       return DaoLocator.JobDao.GetSerializedJobStream(jobId);
-      
     }
 
@@ -122 +122 @@
     /// <returns></returns>
     public ResponseObject<JobDto> GetJobById(Guid jobId) {
-        ResponseObject<JobDto> response = new ResponseObject<JobDto>();
+      ResponseObject<JobDto> response = new ResponseObject<JobDto>();
 
       response.Obj = DaoLocator.JobDao.FindById(jobId);
-        if (response.Obj != null) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
-        } else {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-        }
-
-        return response;
-      }
+      if (response.Obj != null) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
+      }
+      else {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+      }
+
+      return response;
+    }
 
     public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) {
@@ -144 +145 @@
 
         job.Obj.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
-      } else {
+      }
+      else {
         job.Success = false;
         job.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-      }      
+      }
       return job;
     }
@@ -154 +156 @@
       IClientGroupDao cgd = DaoLocator.ClientGroupDao;
       foreach (string res in resources) {
-        foreach(ClientGroupDto cg in cgd.FindByName(res)) {
+        foreach (ClientGroupDto cg in cgd.FindByName(res)) {
           job.JobInfo.AssignedResourceIds.Add(cg.Id);
         }
@@ -167 +169 @@
     /// <returns></returns>
     public ResponseObject<JobDto> AddNewJob(SerializedJob job) {
-        ResponseObject<JobDto> response = new ResponseObject<JobDto>();
-
-        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.JobInfo.Id != Guid.Empty) {
-            response.Success = false;
-            response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
-            return response;
-          }
-          if (job.SerializedJobData == null) {
-            response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
-            response.Success = false;
-            return response;
-          }
-
-          job.JobInfo.DateCreated = DateTime.Now;
-          DaoLocator.JobDao.InsertWithAttachedJob(job);
-          DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
-          
-          response.Success = true;
-          response.Obj = job.JobInfo;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
-        } else {
+      ResponseObject<JobDto> response = new ResponseObject<JobDto>();
+
+      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.JobInfo.Id != Guid.Empty) {
+          response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
+          return response;
+        }
+        if (job.SerializedJobData == null) {
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
-        }
-
+          response.Success = false;
+          return response;
+        }
+
+        job.JobInfo.DateCreated = DateTime.Now;
+        DaoLocator.JobDao.InsertWithAttachedJob(job);
+        DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
+
+        response.Success = true;
+        response.Obj = job.JobInfo;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
+      }
+      else {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
+      }
+
+      return response;
+    }
+
+    /// <summary>
+    /// Removes a job from the database
+    /// </summary>
+    /// <param name="jobId"></param>
+    /// <returns></returns>
+    public Response RemoveJob(Guid jobId) {
+      Response response = new Response();
+
+      JobDto job = DaoLocator.JobDao.FindById(jobId);
+      if (job == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
         return response;
       }
-    /*  finally {
-        if (session != null)
-          session.EndSession();
-      }
-    } */
-
-    /// <summary>
-    /// Removes a job from the database
-    /// </summary>
-    /// <param name="jobId"></param>
-    /// <returns></returns>
-    public Response RemoveJob(Guid jobId) {
-        Response response = new Response();
-
-      JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (job == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-          return response;
-        }
-        DaoLocator.JobDao.Delete(job);
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_REMOVED;
-
-        return response;
-      }
+      DaoLocator.JobDao.Delete(job);
+      response.Success = false;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_REMOVED;
+
+      return response;
+    }
 
     public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
@@ -231 +229 @@
         new ResponseObject<JobDto>();
 
-       result.Obj =
-         GetLastJobResult(jobId);
-       result.Success =
-         result.Obj != null;
-
-       return result;
+      result.Obj =
+        GetLastJobResult(jobId);
+      result.Success =
+        result.Obj != null;
+
+      return result;
     }
 
     public ResponseObject<SerializedJob>
       GetLastSerializedJobResultOf(Guid jobId, bool requested) {
-
-        ResponseObject<SerializedJob> response =
-          new ResponseObject<SerializedJob>();
+      ResponseObject<SerializedJob> response =
+        new ResponseObject<SerializedJob>();
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (requested && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
-          
-          //tx.Commit();
-          
-          return response;
-        }
-
-        /*JobResult lastResult =
-          jobResultsAdapter.GetLastResultOf(job.Id);*/
-
-        //if (lastResult != null) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
-          response.Obj = new SerializedJob();
-          response.Obj.JobInfo = job;
-          response.Obj.SerializedJobData =
-            DaoLocator.JobDao.GetBinaryJobFile(jobId);
-        //} else {
-        //  response.Success = false;
-        //}
-
-        //tx.Commit();
+      if (requested && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+
         return response;
       }
-      /*catch (Exception ex) {
-        if (tx != null)
-          tx.Rollback();
-        throw ex;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }    */
+
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
+      response.Obj = new SerializedJob();
+      response.Obj.JobInfo = job;
+      response.Obj.SerializedJobData =
+        DaoLocator.JobDao.GetBinaryJobFile(jobId);
+      return response;
+    }
 
 
     public Response RequestSnapshot(Guid jobId) {
-     // ISession session = factory.GetSessionForCurrentThread();
       Response response = new Response();
-      
-     /* try {
-        IJobAdapter jobAdapter = session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
-        JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
-          return response; // no commit needed
-        }
-        if (job.State != State.calculating) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
-          return response; // no commit needed
-        }
-        // job is in correct state
-        job.State = State.requestSnapshot;
-        DaoLocator.JobDao.Update(job);
-
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_SET;
-
+
+
+      JobDto job = DaoLocator.JobDao.FindById(jobId);
+      if (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
         return response;
       }
-    /*  finally {
-        if (session != null)
-          session.EndSession();
-      }
-    } */
+      if (job.State != State.calculating) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
+        return response;
+      }
+      // job is in correct state
+      job.State = State.requestSnapshot;
+      DaoLocator.JobDao.Update(job);
+
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_SET;
+
+      return response;
+    }
 
     public Response AbortJob(Guid jobId) {
-      //ISession session = factory.GetSessionForCurrentThread();
       Response response = new Response();
 
-    /*  try {
-        IJobAdapter jobAdapter = session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
-//        JobDto job = jobAdapter.GetById(jobId);
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (job == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-          return response; // no commit needed
-        }
-        if (job.State == State.abort) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
-          return response; // no commit needed
-        }
-        if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
-          return response; // no commit needed
-        }
-        // job is in correct state
-        job.State = State.abort;
+      if (job == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+        return response; // no commit needed
+      }
+      if (job.State == State.abort) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
+        return response; // no commit needed
+      }
+      if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
+        return response; // no commit needed
+      }
+      // job is in correct state
+      job.State = State.abort;
       DaoLocator.JobDao.Update(job);
 
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_SET;
-
-        return response;
-      }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }   */
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_SET;
+
+      return response;
+    }
 
     public ResponseList<JobResult> GetAllJobResults(Guid jobId) {
@@ -381 +339 @@
 
     public ResponseList<JobDto> GetJobsByProject(Guid projectId) {
-      return null;      
-    }
+      return null;
+    }
+
+    public byte[] GetSerializedJobDataById(Guid jobId) {
+      return DaoLocator.JobDao.GetBinaryJobFile(jobId);
+    }
+
+    public void SetSerializedJobDataById(Guid jobId, byte[] data) {
+      DaoLocator.JobDao.SetBinaryJobFile(jobId, data);
+    }
+
     #endregion
   }