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

Timestamp:

08/19/10 15:47:46 (14 years ago)

Author:

cneumuel

Message:

renamed all database entities from "Client" to "Slave" (#1157)
made slave-heartbeats synchronous, also they send HBs when timetable disallows them to calculate. they will appear on the server as Idle bis IsAllowedToCalculate will be false (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (1 diff)

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

@@ -30 +30 @@
         JobDto jobToCalculate = null;
         using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
-          ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
+          SlaveDto slave = DaoLocator.SlaveDao.FindById(slaveId);
           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.Client = slave;
-            jobToCalculate.Client.State = SlaveState.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.ClientDao.Update(jobToCalculate.Client);
+            DaoLocator.SlaveDao.Update(jobToCalculate.Slave);
           }
           scope.Complete();