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

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
-  public class JobDao: BaseDao<JobDto, Job>, IJobDao {
-   
+  public class JobDao : BaseDao<JobDto, Job>, IJobDao {
+
     #region IGenericDao<JobDto,Job> Members
 
@@ -28 +28 @@
       IQueryable<JobDto> query = null;
       if (jobState == JobState.Finished) {
-         query = from job in Context.Jobs
-                 where job.JobState == Enum.GetName(typeof (JobState), jobState)
-                 orderby job.DateFinished
-                 select EntityToDto(job, null);
+        query = from job in Context.Jobs
+                where job.JobState == Enum.GetName(typeof(JobState), jobState)
+                orderby job.DateFinished
+                select EntityToDto(job, null);
       } else if (jobState == JobState.Calculating || jobState == JobState.SnapshotRequested || jobState == JobState.SnapshotSent) {
         query = from job in Context.Jobs
-                    where job.JobState == Enum.GetName(typeof(JobState), jobState)
-                    orderby job.DateCalculated
-                    select EntityToDto(job, null);
+                where job.JobState == Enum.GetName(typeof(JobState), jobState)
+                orderby job.DateCalculated
+                select EntityToDto(job, null);
       } else {
         query = from job in Context.Jobs
-                    where job.JobState == Enum.GetName(typeof(JobState), jobState)
-                    orderby job.DateCreated
-                    select EntityToDto(job, null);
+                where job.JobState == Enum.GetName(typeof(JobState), jobState)
+                orderby job.DateCreated
+                select EntityToDto(job, null);
       }
 
@@ -74 +74 @@
       j.SerializedJob = job.SerializedJobData;
       foreach (Guid assignRessourceId in job.JobInfo.AssignedResourceIds)
-        j.AssignedResources.Add(new AssignedResource { ResourceId = assignRessourceId});
+        j.AssignedResources.Add(new AssignedResource { ResourceId = assignRessourceId });
       Context.Jobs.InsertOnSubmit(j);
       CommitChanges();
@@ -89 +89 @@
     public void Update(JobDto bObj) {
       Job job = Context.Jobs.SingleOrDefault(j => j.JobId.Equals(bObj.Id));
-      DtoToEntity(bObj, job);    
-      CommitChanges(); 
-    }
-
-    public IEnumerable<JobDto> FindActiveJobsOfSlave(ClientDto client) {
+      DtoToEntity(bObj, job);
+      CommitChanges();
+    }
+
+    public IEnumerable<JobDto> FindActiveJobsOfSlave(SlaveDto slave) {
       return (from j in Context.Jobs
-              where (j.JobState == Enum.GetName(typeof (JobState), JobState.Calculating) ||
-                     j.JobState == Enum.GetName(typeof (JobState), JobState.Aborted) ||
-                     j.JobState == Enum.GetName(typeof (JobState), JobState.SnapshotRequested) ||
-                     j.JobState == Enum.GetName(typeof (JobState), JobState.SnapshotSent)) &&
-                    (j.ResourceId.Equals(client.Id))
+              where (j.JobState == Enum.GetName(typeof(JobState), JobState.Calculating) ||
+                     j.JobState == Enum.GetName(typeof(JobState), JobState.Aborted) ||
+                     j.JobState == Enum.GetName(typeof(JobState), JobState.SnapshotRequested) ||
+                     j.JobState == Enum.GetName(typeof(JobState), JobState.SnapshotSent)) &&
+                    (j.ResourceId.Equals(slave.Id))
               select EntityToDto(j, null)).ToList();
     }
 
-    public IEnumerable<JobDto> FindFittingJobsForSlave(JobState state, int freeCores, int freeMemory, Guid clientId) {
-      ClientGroupDao cgd = new ClientGroupDao();
-      
-      List<Guid> idList = new List<Guid>(cgd.FindAllGroupAndParentGroupIdsForClient(clientId));
+    public IEnumerable<JobDto> FindFittingJobsForSlave(JobState state, int freeCores, int freeMemory, Guid slaveId) {
+      SlaveGroupDao cgd = new SlaveGroupDao();
+
+      List<Guid> idList = new List<Guid>(cgd.FindAllGroupAndParentGroupIdsForSlave(slaveId));
       //Add myself too - enables jobs for one specific host!
-      idList.Add(clientId);
-      
-      var q = (from ar in Context.AssignedResources               
-               where ar.Job.JobState == Enum.GetName(typeof (JobState), JobState.Offline) &&
+      idList.Add(slaveId);
+
+      var q = (from ar in Context.AssignedResources
+               where ar.Job.JobState == Enum.GetName(typeof(JobState), JobState.Offline) &&
                      ar.Job.CoresNeeded <= freeCores &&
                      ar.Job.MemoryNeeded <= freeMemory &&
                      idList.Contains(ar.ResourceId)
-               orderby ar.Job.Priority descending                 
+               orderby ar.Job.Priority descending
                select EntityToDto(ar.Job, null));
       return q.ToList();
@@ -122 +122 @@
     public IEnumerable<JobDto> GetJobsByState(JobState state) {
       return (from j in Context.Jobs
-              where (j.JobState == Enum.GetName(typeof (JobState), state))
+              where (j.JobState == Enum.GetName(typeof(JobState), state))
               select EntityToDto(j, null)).ToList();
     }
 
-    public void AssignSlaveToJob(Guid clientId, Guid jobId) {
-      Client c = Context.Resources.OfType<Client>().SingleOrDefault(client => client.ResourceId.Equals(clientId));
+    public void AssignSlaveToJob(Guid slaveId, Guid jobId) {
+      Slave c = Context.Resources.OfType<Slave>().SingleOrDefault(slave => slave.ResourceId.Equals(slaveId));
       Job j = Context.Jobs.SingleOrDefault(job => job.JobId.Equals(jobId));
       c.Jobs.Add(j);
-      j.Client = c;
-      CommitChanges();      
+      j.Slave = c;
+      CommitChanges();
     }
 
     public void SetJobOffline(JobDto job) {
       Job j = Context.Jobs.SingleOrDefault(jq => jq.JobId.Equals(job.Id));
-      j.Client = null;
-      j.JobState = Enum.GetName(typeof(JobState), JobState.Offline); 
+      j.Slave = null;
+      j.JobState = Enum.GetName(typeof(JobState), JobState.Offline);
       CommitChanges();
     }
 
     public Stream GetSerializedJobStream(Guid jobId) {
-      VarBinarySource source =
-        new VarBinarySource(
-          (SqlConnection)Context.Connection, null,
-          "Job", "SerializedJob", "JobId", jobId);
-
+      VarBinarySource source = new VarBinarySource((SqlConnection)Context.Connection, null, "Job", "SerializedJob", "JobId", jobId);
       return new VarBinaryStream(source);
     }
@@ -152 +148 @@
     public IEnumerable<JobDto> FindJobsById(IEnumerable<Guid> jobIds) {
       IQueryable<JobDto> jobs = from job in Context.Jobs
-                       where jobIds.Contains(job.JobId)
-                       select EntityToDto(job, null);
+                                where jobIds.Contains(job.JobId)
+                                select EntityToDto(job, null);
 
       return jobs.ToList();
@@ -182 +178 @@
 
     //Assigned ressources are not used atm!
-    //Client is not used ATM - not sure when we stopped using those...
+    //Slave is not used ATM - not sure when we stopped using those...
     public override JobDto EntityToDto(Job source, JobDto target) {
       if (source == null)
         return null;
-      if(target == null)
+      if (target == null)
         target = new JobDto();
-    
+
       //target.ParentJob = null;
       //target.PluginsNeeded = null;
-      //target.Client = null;
+      //target.Slave = null;
       //target.Project = null;
-      
+
       target.CoresNeeded = source.CoresNeeded;
       target.MemoryNeeded = source.MemoryNeeded;
@@ -204 +200 @@
       target.Exception = source.Exception;
       target.Percentage = source.Percentage;
-      
+
       target.Priority = source.Priority;
-      target.State = (JobState) Enum.Parse(typeof (JobState), source.JobState, true);
+      target.State = (JobState)Enum.Parse(typeof(JobState), source.JobState, true);
       return target;
     }