Changeset 4368 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

Timestamp:

09/07/10 10:22:27 (14 years ago)

Author:

cneumuel

Message:

• created HiveClient which shows an overview over all submitted HiveExperiments
• its possible to download all submitted HiveExperiments including results
• Experiments are now sent as a whole to the Hive and the Hive-Slaves take care of creating child-jobs (if necessary). The parent job is then paused and will be reactivated when all child-jobs are finished
• WcfService-Clients are now consistently managed by WcfServicePool which allows to use IDisposable-Pattern and always keeps exactly one proxy-object until all callers disposed them.
• created ProgressView which is able to lock a View and display progress of an action. It also allows to simulate progress if no progress-information is available so that users don't get too nervous while waiting.

File:

• branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (3 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -21 +21 @@
 
     public bool ExistsJobForSlave(HeartBeatData hbData) {
-      List<JobDto> allOfflineJobsForSlave = new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(JobState.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
-      return (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0);
+      return 
+        DaoLocator.JobDao.FindJobsWithFinishedChilds(hbData.SlaveId).Count() > 0 || 
+        DaoLocator.JobDao.FindFittingJobs(JobState.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId).Count() > 0;
     }
 
@@ -31 +32 @@
         using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
           SlaveDto slave = DaoLocator.SlaveDao.FindById(slaveId);
+
           if (slave != null) {
-            LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(JobState.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
-            if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
-              jobToCalculate = allOfflineJobsForSlave.First.Value;
-              jobToCalculate.State = JobState.Calculating;
-              jobToCalculate.Slave = slave;
-              jobToCalculate.Slave.State = SlaveState.Calculating;
-              jobToCalculate.DateCalculated = DateTime.Now;
-              DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
-              DaoLocator.JobDao.Update(jobToCalculate);
-              DaoLocator.SlaveDao.Update(jobToCalculate.Slave);
+            LinkedList<JobDto> finishedJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindJobsWithFinishedChilds(slave.Id));
+            if (finishedJobsForSlave != null && finishedJobsForSlave.Count > 0) {
+              jobToCalculate = finishedJobsForSlave.First.Value;
+              UpdateJobAsCalculating(jobToCalculate, slave);
+            }
+
+            LinkedList<JobDto> offlineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobs(JobState.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
+            if (offlineJobsForSlave != null && offlineJobsForSlave.Count > 0) {
+              jobToCalculate = offlineJobsForSlave.First.Value;
+              UpdateJobAsCalculating(jobToCalculate, slave);
             }
           }
@@ -52 +54 @@
     }
 
+    private static void UpdateJobAsCalculating(JobDto jobToCalculate, SlaveDto slave) {
+      jobToCalculate.State = JobState.Calculating;
+      jobToCalculate.Slave = slave;
+      jobToCalculate.Slave.State = SlaveState.Calculating;
+      jobToCalculate.DateCalculated = DateTime.Now;
+      DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);
+      DaoLocator.JobDao.Update(jobToCalculate);
+      DaoLocator.SlaveDao.Update(jobToCalculate.Slave);
+    }
+
     #endregion
   }