Changeset 5106 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

Timestamp:

12/14/10 16:52:55 (13 years ago)

Author:

cneumuel

Message:

#1233

• made MockJob to execute asynchronously with the option to spinWait
• added methods to IHiveService
• implemented methods for Slave handling in HiveService
• added more tests for server
• changed db-schema of slaves and slavegroups

File:

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

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

@@ -17 +17 @@
   /// Implementation of the Hive service (interface <see cref="IHiveService"/>).
   /// </summary>
-  [ServiceBehavior(InstanceContextMode=InstanceContextMode.PerCall)]
+  [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall)]
   public class HiveService : IHiveService {
     private DataAccess.IHiveDao dao {
@@ -37 +37 @@
     public Guid AddJob(Job job, JobData jobData) {
       using (trans.OpenTransaction()) {
+        job.UserId = auth.UserId;
+        job.DateCreated = DateTime.Now;
+        job.JobState = JobState.Waiting;
         jobData.JobId = dao.AddJob(job);
+        jobData.LastUpdate = DateTime.Now;
         dao.AddJobData(jobData);
         return jobData.JobId;
@@ -46 +50 @@
       using (trans.OpenTransaction()) {
         job.ParentJobId = parentJobId;
+        jobData.LastUpdate = DateTime.Now;
         return AddJob(job, jobData);
       }
@@ -66 +71 @@
     }
 
-    // formerly GetLastSerializedResult
     public JobData GetJobData(Guid jobId) {
       return dao.GetJobData(jobId);
     }
 
-    public Stream GetJobDataStreamed(Guid jobId) {
-      throw new NotImplementedException();
-    }
-
-    public void UpdateJob(Job jobDto, JobData jobDataDto) {
-      using (trans.OpenTransaction()) {
-        dao.UpdateJob(jobDto);
-        dao.UpdateJobData(jobDataDto);
-      }
-    }
-
-    public void UpdateJobDataStreamed(Stream stream) {
-      using (trans.OpenTransaction()) {
-        throw new NotImplementedException();
-      }
-    }
-
-    public void DeleteChildJobs(Guid jobId) {
-      using (trans.OpenTransaction()) {
-        var jobs = GetChildJobs(jobId, true, false);
+    public void UpdateJob(Job job, JobData jobData) {
+      using (trans.OpenTransaction()) {
+        jobData.LastUpdate = DateTime.Now;
+        dao.UpdateJob(job);
+        dao.UpdateJobData(jobData);
+      }
+    }
+
+    public void DeleteJob(Guid jobId) {
+      using (trans.OpenTransaction()) {
+        dao.DeleteJob(jobId);
+      }
+    }
+
+    public void DeleteChildJobs(Guid parentJobId) {
+      using (trans.OpenTransaction()) {
+        var jobs = GetChildJobs(parentJobId, true, false);
         foreach (var job in jobs) {
           dao.DeleteJob(job.Id);
@@ -144 +145 @@
       using (trans.OpenTransaction()) {
         hiveExperimentDto.UserId = auth.UserId;
+        hiveExperimentDto.DateCreated = DateTime.Now;
         return dao.AddHiveExperiment(hiveExperimentDto);
       }
@@ -157 +159 @@
       using (trans.OpenTransaction()) {
         HiveExperiment he = dao.GetHiveExperiment(hiveExperimentId);
-        if (he.RootJobId.HasValue) {
-          var jobs = GetChildJobs(he.RootJobId.Value, true, true);
-          foreach (var j in jobs) {
-            dao.DeleteJobData(j.Id);
-            dao.DeleteJob(j.Id);
-          }
-        }
-        dao.DeleteHiveExperiment(hiveExperimentId);
-      }
-    }
-    #endregion
-    
+        dao.DeleteHiveExperiment(hiveExperimentId); // child jobs will be deleted by db-trigger
+      }
+    }
+    #endregion
+
     #region Login Methods
     public void Hello(Guid slaveId, string name, int cores, int memory) {
@@ -208 +203 @@
     }
     #endregion
-    
+
     #region Slave Methods
     public Guid AddSlave(Slave slave) {
@@ -222 +217 @@
     }
 
+    public Slave GetSlave(Guid slaveId) {
+      return dao.GetSlave(slaveId);
+    }
+
+    public SlaveGroup GetSlaveGroup(Guid slaveGroupId) {
+      return dao.GetSlaveGroup(slaveGroupId);
+    }
+
     public IEnumerable<Slave> GetSlaves() {
       return dao.GetSlaves(x => true);
@@ -230 +233 @@
     }
 
+    public void UpdateSlave(Slave slave) {
+      using (trans.OpenTransaction()) {
+        dao.UpdateSlave(slave);
+      }
+    }
+
+    public void UpdateSlaveGroup(SlaveGroup slaveGroup) {
+      using (trans.OpenTransaction()) {
+        dao.UpdateSlaveGroup(slaveGroup);
+      }
+    }
+
+    public void DeleteSlave(Guid slaveId) {
+      using (trans.OpenTransaction()) {
+        dao.DeleteSlave(slaveId);
+      }
+    }
+
     public void DeleteSlaveGroup(Guid slaveGroupId) {
       using (trans.OpenTransaction()) {
@@ -236 +257 @@
     }
 
-    public void AddResourceToGroup(Guid slaveGroupId, Resource resource) {
-      using (trans.OpenTransaction()) {
-        throw new NotImplementedException();
-      }
-    }
-
-    public void RemoveResourceFromGroup(Guid clientGroupId, Guid resourceId) {
-      using (trans.OpenTransaction()) {
-        throw new NotImplementedException();
-      }
-    }
-
-    public void UpdateSlave(Slave slave) {
-      using (trans.OpenTransaction()) {
-        dao.UpdateSlave(slave);
-      }
-    }
+    public void AddResourceToGroup(Guid slaveGroupId, Guid resourceId) {
+      using (trans.OpenTransaction()) {
+        var resource = dao.GetResource(resourceId);
+        resource.ParentResourceId = slaveGroupId;
+        dao.UpdateResource(resource);
+      }
+    }
+
+    public void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
+      using (trans.OpenTransaction()) {
+        var resource = dao.GetResource(resourceId);
+        resource.ParentResourceId = null;
+        dao.UpdateResource(resource);
+      }
+    }
+
     #endregion