Changeset 5636 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

Timestamp:

03/08/11 14:54:17 (13 years ago)

Author:

cneumuel

Message:

#1233

• updated jobstates documentation
• enhanced ganttChart
• fixed setting of jobstates
• added option to force lifecycle-trigger (mainly for testing purposes)

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

@@ -49 +49 @@
     public NetworkEnum.WcfConnState ConnState { get; private set; }
 
+    private WcfService() {
+      ConnState = NetworkEnum.WcfConnState.Disconnected;
+    }
+
+    #region Job Methods
+    public Job GetJob(Guid jobId) {
+      return CallHiveService(s => s.GetJob(jobId));
+    }
+
+    public void UpdateJob(Job job) {
+      CallHiveService(s => s.UpdateJob(job));
+    }
+
+    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
+      return CallHiveService(s => s.AddChildJob(parentJobId, job, jobData));
+    }
+
+    public IEnumerable<JobData> GetChildJobs(Guid? parentJobId) {
+      return CallHiveService(service => {
+        IEnumerable<LightweightJob> msg = service.GetLightweightChildJobs(parentJobId, false, false);
+
+        List<JobData> jobs = new List<JobData>();
+        foreach (LightweightJob ljob in msg)
+          jobs.Add(service.GetJobData(ljob.Id));
+
+        return jobs;
+      });
+    }
+
+    public void DeleteChildJobs(Guid jobId) {
+      CallHiveService(s => s.DeleteChildJobs(jobId));
+    }
+    #endregion
+
+    #region JobData Methods
+    public JobData GetJobData(Guid jobId) {
+      return CallHiveService(s => s.GetJobData(jobId));
+    }
+
+    /// <summary>
+    /// Uploads the JobData and sets a new jobState (while correctly setting Transferring state)
+    /// </summary>
+    public void UpdateJobData(Job job, JobData jobData, Guid slaveId, JobState state) {
+      CallHiveService(service => {
+        service.UpdateJob(job);
+        job = service.UpdateJobState(job.Id, JobState.Transferring, slaveId, null, null);
+        service.UpdateJobData(job, jobData);
+        service.UpdateJobState(job.Id, state, slaveId, null, null);
+      });
+    }
+
+    public Job UpdateJobState(Guid jobId, JobState jobState, string exception) {
+      return CallHiveService(s => s.UpdateJobState(jobId, jobState, ConfigManager.GetUniqueMachineId(), null, exception));
+    }
+    #endregion
+
+    #region Heartbeat Methods
+    public List<MessageContainer> SendHeartbeat(Heartbeat heartbeat) {
+      return CallHiveService(s => s.Heartbeat(heartbeat));
+    }
+    #endregion
+
+    #region Plugin Methods
+    public IEnumerable<Plugin> GetPlugins() {
+      return CallHiveService(s => s.GetPlugins());
+    }
+
+    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
+      return CallHiveService(s => s.GetPluginDatas(pluginIds));
+    }
+    #endregion
+
+    #region Events
     public event EventHandler Connected;
     private void OnConnected() {
@@ -60 +133 @@
       if (handler != null) handler(this, new EventArgs<Exception>(e));
     }
+    #endregion
 
-    /// <summary>
-    /// Constructor
-    /// </summary>
-    private WcfService() {
-      ConnState = NetworkEnum.WcfConnState.Disconnected;
-    }
-
+    #region Helpers
     /// <summary>
     /// Connects with the Server, registers the events and fires the Connected (and quiet possibly the ConnectionRestored) Event.
@@ -99 +167 @@
     }
 
-    /// <summary>
-    /// Get a Job from the Server
-    /// </summary>
-    public Job GetJob(Guid jobId) {
-      return CallHiveService(s => s.GetJob(jobId));
-    }
-
-    public JobData GetJobData(Guid jobId) {
-      return CallHiveService(s => s.GetJobData(jobId));
-    }
-
-    public void UpdateJob(Job job) {
-      CallHiveService(s => s.UpdateJob(job));
-    }
-
-    /// <summary>
-    /// used on pause or if job finished to upload the job results
-    /// </summary>
-    /// <param name="job"></param>
-    /// <param name="jobData"></param>    
-    public void UpdateJobData(Job job, JobData jobData, Guid slaveId) {
-      CallHiveService(service => {
-        JobState before = job.State;
-        job.SetState(JobState.Transferring, slaveId, "");
-
-        service.UpdateJob(job);
-
-        service.UpdateJobData(job, jobData);
-
-        job.SetState(before, slaveId, "");
-        service.UpdateJob(job);
-      });
-    }
-
-    public List<MessageContainer> SendHeartbeat(Heartbeat heartbeat) {
-      return CallHiveService(s => s.Heartbeat(heartbeat));
-    }
-
-    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
-      return CallHiveService(s => s.GetPluginDatas(pluginIds));
-    }
-
-    public IEnumerable<Plugin> GetPlugins() {
-      return CallHiveService(s => s.GetPlugins());
-    }
-
-    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
-      return CallHiveService(s => s.AddChildJob(parentJobId, job, jobData));
-    }
-
-    public IEnumerable<JobData> GetChildJobs(Guid? parentJobId) {
-      return CallHiveService(service => {
-        IEnumerable<LightweightJob> msg = service.GetLightweightChildJobs(parentJobId, false, false);
-
-        List<JobData> jobs = new List<JobData>();
-        foreach (LightweightJob ljob in msg)
-          jobs.Add(service.GetJobData(ljob.Id));
-
-        return jobs;
-      });
-    }
-
-    public void DeleteChildJobs(Guid jobId) {
-      CallHiveService(s => s.DeleteChildJobs(jobId));
-    }
-
     public void CallHiveService(Action<IHiveService> call) {
       try {
@@ -183 +185 @@
       }
     }
+    #endregion
   }
 }