Changeset 1468 for trunk/sources/HeuristicLab.Hive.Server.Scheduler

Timestamp:

03/31/09 01:33:37 (16 years ago)

Author:

svonolfe

Message:

Added transaction management (#527)

Location:

trunk/sources/HeuristicLab.Hive.Server.Scheduler

Files:

• DefaultScheduler.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Scheduler.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Scheduler/DefaultScheduler.cs

@@ -7 +7 @@
 using HeuristicLab.Hive.Server.DataAccess;
 using System.Threading;
+using HeuristicLab.DataAccess.Interfaces;
 
 namespace HeuristicLab.Hive.Server.Scheduler {
   class DefaultScheduler: IScheduler {
 
-    IJobAdapter jobAdapter;
-    IClientAdapter clientAdapter;
+    private ISessionFactory factory;
 
     private static Mutex jobLock =
@@ -20 +20 @@
 
     public DefaultScheduler() {
-      jobAdapter = ServiceLocator.GetJobAdapter();
-      clientAdapter = ServiceLocator.GetClientAdapter();
+      factory = ServiceLocator.GetSessionFactory();
     }
 
     public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
-      List<Job> allOfflineJobs = new List<Job>(jobAdapter.GetJobsByState(State.offline));
-      return (allOfflineJobs.Count > 0);
+      ISession session = factory.GetSessionForCurrentThread();
+
+      try {
+        IJobAdapter jobAdapter =
+          session.GetDataAdapter<Job, IJobAdapter>();
+
+        List<Job> allOfflineJobs = new List<Job>(jobAdapter.GetJobsByState(State.offline));
+        return (allOfflineJobs.Count > 0);
+      }
+      finally {
+        if (session != null)
+          session.EndSession();
+      }
     }
 
     public HeuristicLab.Hive.Contracts.BusinessObjects.Job GetNextJobForClient(Guid clientId) {
+      ISession session = factory.GetSessionForCurrentThread();
 
-      /// Critical section ///
-      jobLock.WaitOne();
+      try {
+        IJobAdapter jobAdapter =
+          session.GetDataAdapter<Job, IJobAdapter>();
 
-      LinkedList<Job> allOfflineJobs = new LinkedList<Job>(jobAdapter.GetJobsByState(State.offline));
+        IClientAdapter clientAdapter =
+          session.GetDataAdapter<ClientInfo, IClientAdapter>();
 
-      Job job2Calculate = null;
-      if (allOfflineJobs != null && allOfflineJobs.Count > 0) {
-        job2Calculate = allOfflineJobs.First.Value;
-        job2Calculate.State = State.calculating;
-        job2Calculate.Client = clientAdapter.GetById(clientId);
-        job2Calculate.Client.State = State.calculating;
+        /// Critical section ///
+        jobLock.WaitOne();
 
-        job2Calculate.DateCalculated = DateTime.Now;
-        jobAdapter.Update(job2Calculate);
+        LinkedList<Job> allOfflineJobs = new LinkedList<Job>(jobAdapter.GetJobsByState(State.offline));
+
+        Job job2Calculate = null;
+        if (allOfflineJobs != null && allOfflineJobs.Count > 0) {
+          job2Calculate = allOfflineJobs.First.Value;
+          job2Calculate.State = State.calculating;
+          job2Calculate.Client = clientAdapter.GetById(clientId);
+          job2Calculate.Client.State = State.calculating;
+
+          job2Calculate.DateCalculated = DateTime.Now;
+          jobAdapter.Update(job2Calculate);
+        }
+        jobLock.ReleaseMutex();
+        /// End Critical section ///
+
+        return job2Calculate;
       }
-      jobLock.ReleaseMutex();
-      /// End Critical section ///
-
-      return job2Calculate;
+      finally {
+        if (session != null)
+          session.EndSession();
+      }
     }
 

trunk/sources/HeuristicLab.Hive.Server.Scheduler/HeuristicLab.Hive.Server.Scheduler.csproj

@@ -73 +73 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.DataAccess.ADOHelper\HeuristicLab.DataAccess.ADOHelper.csproj">
+      <Project>{5CDACE54-5FB2-4344-A21C-963F63CB7C2B}</Project>
+      <Name>HeuristicLab.DataAccess.ADOHelper</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.DataAccess\HeuristicLab.DataAccess.csproj">
       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>