Changeset 3018 for trunk/sources/HeuristicLab.Hive.Server.Core

Timestamp:

03/14/10 12:07:47 (14 years ago)

Author:

kgrading

Message:

added Priority and resource restricted scheduling (#907)

Location:

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

Files:

• ClientCommunicator.cs (modified) (5 diffs)
• DefaultScheduler.cs (modified) (2 diffs)
• JobManager.cs (modified) (1 diff)

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

@@ -103 +103 @@
                               " wasn't offline but hasn't sent heartbeats - setting offline");
               client.State = State.offline;
-              DaoLocator.ClientDao.Update(client);              
+              DaoLocator.ClientDao.Update(client);
               HiveLogger.Info(this.ToString() + ": Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - Resetting all his jobs");
@@ -236 +236 @@
     /// <returns></returns>
     public ResponseHB ProcessHeartBeat(HeartBeatData hbData) {
-      
-     /* ISession session = factory.GetSessionForCurrentThread();
-      ITransaction tx = null;*/
-
-      HiveLogger.Info(this.ToString() + ": BEGIN Processing Heartbeat for Client " + hbData.ClientId);
-
-      //try {
-        HiveLogger.Info(this.ToString() + ": BEGIN Fetching Adapters");
-      /*  IClientAdapter clientAdapter =
-          session.GetDataAdapter<ClientDto, IClientAdapter>();
-
-        IJobAdapter jobAdapter =        
-          session.GetDataAdapter<JobDto, IJobAdapter>(); */
-        HiveLogger.Info(this.ToString() + ": END Fetched Adapters");
-        HiveLogger.Info(this.ToString() + ": BEGIN Starting Transaction");
-        //tx = session.BeginTransaction();
-        HiveLogger.Info(this.ToString() + ": END Started Transaction");
+      HiveLogger.Debug(this.ToString() + ": BEGIN Processing Heartbeat for Client " + hbData.ClientId);
+      HiveLogger.Debug(this.ToString() + ": BEGIN Fetching Adapters");
+      HiveLogger.Debug(this.ToString() + ": END Fetched Adapters");
+      HiveLogger.Debug(this.ToString() + ": BEGIN Starting Transaction");
+
+      HiveLogger.Debug(this.ToString() + ": END Started Transaction");
 
         ResponseHB response = new ResponseHB();
         response.ActionRequest = new List<MessageContainer>();
 
-        HiveLogger.Info(this.ToString() + ": BEGIN Started Client Fetching");
+        HiveLogger.Debug(this.ToString() + ": BEGIN Started Client Fetching");
         ClientDto client = DaoLocator.ClientDao.FindById(hbData.ClientId);
-        HiveLogger.Info(this.ToString() + ": END Finished Client Fetching");
+        HiveLogger.Debug(this.ToString() + ": END Finished Client Fetching");
         // check if the client is logged in
         if (client.State == State.offline || client.State == State.nullState) {
@@ -275 +264 @@
 
         // save timestamp of this heartbeat
-        HiveLogger.Info(this.ToString() + ": BEGIN Locking for Heartbeats");
+        HiveLogger.Debug(this.ToString() + ": BEGIN Locking for Heartbeats");
         heartbeatLock.EnterWriteLock();
-        HiveLogger.Info(this.ToString() + ": END Locked for Heartbeats");
+        HiveLogger.Debug(this.ToString() + ": END Locked for Heartbeats");
         if (lastHeartbeats.ContainsKey(hbData.ClientId)) {
           lastHeartbeats[hbData.ClientId] = DateTime.Now;
@@ -287 +276 @@
         // check if client has a free core for a new job
         // if true, ask scheduler for a new job for this client
-        HiveLogger.Info(this.ToString() + ": BEGIN Looking for Client Jobs");
+        HiveLogger.Debug(this.ToString() + ": BEGIN Looking for Client Jobs");
         if (hbData.FreeCores > 0 && scheduler.ExistsJobForClient(hbData)) {
           response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchJob));
@@ -293 +282 @@
           response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
         }
-        HiveLogger.Info(this.ToString() + ": END Looked for Client Jobs");
+        HiveLogger.Debug(this.ToString() + ": END Looked for Client Jobs");
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED;
 
-        HiveLogger.Info(this.ToString() + ": BEGIN Processing Heartbeat Jobs");
+        HiveLogger.Debug(this.ToString() + ": BEGIN Processing Heartbeat Jobs");
         processJobProcess(hbData, response);
-        HiveLogger.Info(this.ToString() + ": END Processed Heartbeat Jobs");
+        HiveLogger.Debug(this.ToString() + ": END Processed Heartbeat Jobs");
         
         DaoLocator.ClientDao.Update(client);
 
         //tx.Commit();
-        HiveLogger.Info(this.ToString() + ": END Processed Heartbeat for Client " + hbData.ClientId);
+        HiveLogger.Debug(this.ToString() + ": END Processed Heartbeat for Client " + hbData.ClientId);
         return response;
-      } /*
-      catch (Exception ex) {
-        if (tx != null)
-          tx.Rollback();
-        throw ex;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }   
-    }     */
+      }
 
     /// <summary>

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

@@ -10 +10 @@
 
 namespace HeuristicLab.Hive.Server.Core {
-  class DefaultScheduler: IScheduler {
-
+  internal class DefaultScheduler : IScheduler {
     //private ISessionFactory factory;
 
@@ -24 +23 @@
 
     public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
-      //ISession session = factory.GetSessionForCurrentThread();
-
-      //try {
-        /*IJobAdapter jobAdapter =
-          session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
-        List<JobDto> allOfflineJobsForClient = new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, hbData.FreeCores, hbData.FreeMemory));
-          /*jobAdapter.FindJobs(State.offline, 
-          hbData.FreeCores,
-          hbData.FreeMemory, 
-          hbData.ClientId));*/
-        return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
-      //}
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      } */
-    }   
+      List<JobDto> allOfflineJobsForClient =
+        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, hbData.FreeCores, hbData.FreeMemory,
+                                                                    hbData.ClientId));
+      return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
+    }
 
     public HeuristicLab.Hive.Contracts.BusinessObjects.JobDto GetNextJobForClient(Guid clientId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
+      /// Critical section ///
+      jobLock.WaitOne();
 
-      try {
-        IJobAdapter jobAdapter =
-          session.GetDataAdapter<JobDto, IJobAdapter>();
-
-        IClientAdapter clientAdapter =
-          session.GetDataAdapter<ClientDto, IClientAdapter>();*/
-
-        /// Critical section ///
-        jobLock.WaitOne();
-
-        ClientDto client = DaoLocator.ClientDao.FindById(clientId);
+      ClientDto client = DaoLocator.ClientDao.FindById(clientId);
       LinkedList<JobDto> allOfflineJobsForClient =
         new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, client.NrOfFreeCores,
-                                                                          client.FreeMemory));
+                                                                          client.FreeMemory, client.Id));
 
-        JobDto jobToCalculate = null;
-        if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
-          jobToCalculate = allOfflineJobsForClient.First.Value;
-          jobToCalculate.State = State.calculating;
-          jobToCalculate.Client = client;
-          jobToCalculate.Client.State = State.calculating;          
-          jobToCalculate.DateCalculated = DateTime.Now;
-          DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);
-          DaoLocator.JobDao.Update(jobToCalculate);
-          DaoLocator.ClientDao.Update(jobToCalculate.Client);
-        }
-        jobLock.ReleaseMutex();
-        /// End Critical section ///
+      JobDto jobToCalculate = null;
+      if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
+        jobToCalculate = allOfflineJobsForClient.First.Value;
+        jobToCalculate.State = State.calculating;
+        jobToCalculate.Client = client;
+        jobToCalculate.Client.State = State.calculating;
+        jobToCalculate.DateCalculated = DateTime.Now;
+        DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);
+        DaoLocator.JobDao.Update(jobToCalculate);
+        DaoLocator.ClientDao.Update(jobToCalculate.Client);
+      }
+      jobLock.ReleaseMutex();
+      /// End Critical section ///
 
-        return jobToCalculate;
-      }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      } 
-    }   */
+      return jobToCalculate;
+    }
 
     #endregion

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

@@ -184 +184 @@
           DaoLocator.JobDao.InsertWithAttachedJob(job);
           DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
-          //jobAdapter.UpdateSerializedJob(job);
+          
           response.Success = true;
           response.Obj = job.JobInfo;