Changeset 4267 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.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/JobManager.cs (modified) (3 diffs)

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

@@ -119 +119 @@
 
     /// <summary>
-    /// Returns JobDto object with Client-Object attached
+    /// Returns JobDto object with Slave-Object attached
     /// </summary>
     public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) {
@@ -127 +127 @@
         job.StatusMessage = ResponseStatus.Ok;
 
-        job.Obj.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
+        job.Obj.Slave = DaoLocator.SlaveDao.GetSlaveForJob(jobId);
       } else {
         job.StatusMessage = ResponseStatus.GetJobByIdWithDetails_JobDoesNotExist;
@@ -135 +135 @@
 
     public ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources) {
-      IClientGroupDao cgd = DaoLocator.ClientGroupDao;
+      ISlaveGroupDao cgd = DaoLocator.SlaveGroupDao;
       foreach (string res in resources) {
-        foreach (ClientGroupDto cg in cgd.FindByName(res)) {
+        foreach (SlaveGroupDto cg in cgd.FindByName(res)) {
           job.JobInfo.AssignedResourceIds.Add(cg.Id);
         }