Changeset 5404 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs

Timestamp:

02/01/11 15:51:11 (14 years ago)

Author:

cneumuel

Message:

#1233

• changed the workflow of aquireing a new job from server.
  • if a job is available for calculation, the slave receives the jobId already with the heartbeats. The job is then exclusively assigned to this slave.
• extended the metainfo for a slave by OperatingSystem and CpuArchitecture
• enhanced the way plugin-dependencies are discovered by using the types used by XmlGenerator. Now only mimimum amount of plugins are transferred.
• selection of waiting jobs now consideres assigned slave-group
• more unit tests for service
• added unit tests for experiment manager

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs

@@ -82 +82 @@
     }
 
-    public IEnumerable<DT.Job> GetWaitingParentJobs(Guid slaveId) {
-      using (var db = CreateContext()) {
-        // todo: slaveId is unused!
+    public IEnumerable<DT.Job> GetWaitingParentJobs(IEnumerable<Guid> resourceIds, int count) {
+      using (var db = CreateContext()) {
         var query = from ar in db.AssignedResources
-                    where ar.Job.JobState == JobState.WaitingForChildJobs &&
-                      (from child in db.Jobs
-                       where child.ParentJobId == ar.Job.JobId
-                       select child.JobState == JobState.Finished).All(x => x) &&
-                      (from child in db.Jobs // avoid returning WaitForChildJobs jobs where no child-jobs exist (yet)
-                       where child.ParentJobId == ar.Job.JobId
-                       select child).Count() > 0
+                    where resourceIds.Contains(ar.ResourceId)
+                       && ar.Job.JobState == JobState.WaitingForChildJobs
+                       && (from child in db.Jobs
+                           where child.ParentJobId == ar.Job.JobId
+                           select child.JobState == JobState.Finished).All(x => x)
+                       && (from child in db.Jobs // avoid returning WaitForChildJobs jobs where no child-jobs exist (yet)
+                           where child.ParentJobId == ar.Job.JobId
+                           select child).Count() > 0
                     orderby ar.Job.Priority descending
                     select Convert.ToDto(ar.Job);
-        return query.ToArray();
-      }
-    }
-
-    public IEnumerable<DT.Job> GetWaitingJobs(DT.Slave slave) {
-      using (var db = CreateContext()) {
-        var query = from j in db.Jobs
-                    where j.JobState == JobState.Waiting && j.CoresNeeded <= slave.FreeCores && j.MemoryNeeded <= slave.FreeMemory
-                    orderby j.Priority descending
-                    select Convert.ToDto(j);
-        var waitingJobs = query.ToArray();
-        var waitingParentJobs = GetWaitingParentJobs(slave.Id);
+        return count == 0 ? query.ToArray() : query.Take(count).ToArray();
+      }
+    }
+
+    public IEnumerable<DT.Job> GetWaitingJobs(DT.Slave slave, int count) {
+      using (var db = CreateContext()) {
+        var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
+        var waitingParentJobs = GetWaitingParentJobs(resourceIds, count);
+        if (count > 0 && waitingParentJobs.Count() >= count) return waitingParentJobs.Take(count).ToArray();
+
+        var query = from ar in db.AssignedResources
+                    where resourceIds.Contains(ar.ResourceId)
+                       && ar.Job.JobState == JobState.Waiting
+                       && ar.Job.CoresNeeded <= slave.FreeCores
+                       && ar.Job.MemoryNeeded <= slave.FreeMemory
+                    orderby ar.Job.Priority descending
+                    select Convert.ToDto(ar.Job);
+        var waitingJobs = (count == 0 ? query : query.Take(count)).ToArray();
         return waitingJobs.Union(waitingParentJobs).OrderByDescending(x => x.Priority);
       }
@@ -350 +356 @@
       using (var db = CreateContext()) {
         var entity = db.Resources.OfType<SlaveGroup>().FirstOrDefault(x => x.ResourceId == id);
-        if (entity != null) db.Resources.DeleteOnSubmit(entity);
+        if (entity != null) {
+          if (db.Resources.Where(r => r.ParentResourceId == id).Count() > 0) {
+            throw new DaoException("Cannot delete SlaveGroup as long as there are Slaves in the group");
+          }
+          db.Resources.DeleteOnSubmit(entity);
+        }
         db.SubmitChanges();
       }
@@ -408 +419 @@
         return job.AssignedResources.Select(x => Convert.ToDto(x.Resource)).ToArray();
       }
+    }
+
+    /// <summary>
+    /// Returns all parent resources of a resource (the given resource is also added)
+    /// </summary>
+    private IEnumerable<DT.Resource> GetParentResources(Guid resourceId) {
+      using (var db = CreateContext()) {
+        var resources = new List<Resource>();
+        CollectParentResources(resources, db.Resources.Where(r => r.ResourceId == resourceId).Single());
+        return resources.Select(r => Convert.ToDto(r)).ToArray();
+      }
+    }
+
+    private void CollectParentResources(List<Resource> resources, Resource resource) {
+      if (resource == null) return;
+      resources.Add(resource);
+      CollectParentResources(resources, resource.ParentResource);
     }
     #endregion