Changeset 5155 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

12/21/10 18:18:54 (14 years ago)

Author:

cneumuel

Message:

#1233

• minor changes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -35 +35 @@
     //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
-    public Guid AddJob(Job job, JobData jobData) {
+    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> slaveGroupIds) {
       using (trans.OpenTransaction()) {
         job.UserId = auth.UserId;
         job.DateCreated = DateTime.Now;
         job.JobState = JobState.Waiting;
-        jobData.JobId = dao.AddJob(job);
+        job.Id = dao.AddJob(job);
+        jobData.JobId = job.Id;
         jobData.LastUpdate = DateTime.Now;
+        if (slaveGroupIds != null) {
+          foreach (Guid slaveGroupId in slaveGroupIds) {
+            dao.AssignJobToResource(job.Id, slaveGroupId);
+          }
+        } else {
+          // todo: use default group
+        }
         dao.AddJobData(jobData);
         return jobData.JobId;
@@ -50 +58 @@
       using (trans.OpenTransaction()) {
         job.ParentJobId = parentJobId;
-        jobData.LastUpdate = DateTime.Now;
-        return AddJob(job, jobData);
+        return AddJob(job, jobData, dao.GetAssignedResources(parentJobId).Select(x => x.Id));
       }
     }