Changeset 5526 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Timestamp:

02/21/11 17:35:42 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

Location:

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

Files:

• Core.cs (modified) (1 diff)
• WcfService.cs (modified) (6 diffs)

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

@@ -371 +371 @@
         }
         Job cJob = jobs[jobId];
-        cJob.State = JobState.Finished;//TODO: what if failed?
+        cJob.State = JobState.Finished; // TODO: what if failed?
         cJob.ExecutionTime = engines[jobId].ExecutionTime;
 

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Clients.Common;
 using HeuristicLab.Common;
 using HeuristicLab.Services.Hive.Common;
@@ -43 +42 @@
         if (instance == null) {
           instance = new WcfService();
+          ServiceLocator.Instance.Username = "hiveslave";
+          ServiceLocator.Instance.Password = "hiveslave";
         }
         return instance;
@@ -74 +75 @@
     /// </summary>
     public void Connect(HeuristicLab.Services.Hive.Common.DataTransfer.Slave slaveInfo) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          ConnState = NetworkEnum.WcfConnState.Connected;
-          ConnectedSince = DateTime.Now;
-          service.Obj.Hello(slaveInfo);
-          OnConnected();
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
-      }
+      CallHiveService(service => {
+        ConnState = NetworkEnum.WcfConnState.Connected;
+        ConnectedSince = DateTime.Now;
+        service.Hello(slaveInfo);
+        OnConnected();
+      });
     }
 
@@ -91 +87 @@
     /// </summary>
     public void Disconnect() {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          service.Obj.GoodBye(ConfigManager.Instance.GetClientInfo().Id);
-          ConnState = NetworkEnum.WcfConnState.Disconnected;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
-      }
+      CallHiveService(service => {
+        service.GoodBye(ConfigManager.Instance.GetClientInfo().Id);
+        ConnState = NetworkEnum.WcfConnState.Disconnected;
+      });
     }
 
@@ -115 +106 @@
     /// </summary>
     public Job GetJob(Guid jobId) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          Job job = service.Obj.GetJob(jobId);
-          return job;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
-      }
+      return CallHiveService(s => s.GetJob(jobId));
     }
 
     public JobData GetJobData(Guid jobId) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          JobData jobData = service.Obj.GetJobData(jobId);
-          return jobData;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
-      }
+      return CallHiveService(s => s.GetJobData(jobId));
     }
 
     public void UpdateJob(Job job) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          service.Obj.UpdateJob(job);
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
-      }
+      CallHiveService(s => s.UpdateJob(job));
     }
 
@@ -157 +123 @@
     /// <param name="jobData"></param>    
     public void UpdateJobData(Job job, JobData jobData, Guid slaveId) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          JobState before = job.State;
-          job.SetState(JobState.Transferring, slaveId, "");
-          service.Obj.UpdateJob(job);
+      CallHiveService(service => {
+        JobState before = job.State;
+        job.SetState(JobState.Transferring, slaveId, "");
+        service.UpdateJob(job);
 
-          service.Obj.UpdateJobData(job, jobData);
+        service.UpdateJobData(job, jobData);
 
-          job.SetState(before, slaveId, "");
-          service.Obj.UpdateJob(job);
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
+        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 {
+        ServiceLocator.Instance.CallHiveService(call);
       }
-    }
-    
-    public List<MessageContainer> SendHeartbeat(Heartbeat heartbeat) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          List<MessageContainer> msg = service.Obj.Heartbeat(heartbeat);
-          return msg;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
+      catch (Exception ex) {
+        HandleNetworkError(ex);
       }
     }
 
-    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          IEnumerable<PluginData> msg = service.Obj.GetPluginDatas(pluginIds);
-          return msg;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
+    private T CallHiveService<T>(Func<IHiveService, T> call) {
+      try {
+        return ServiceLocator.Instance.CallHiveService(call);
       }
-    }
-
-    public IEnumerable<Plugin> GetPlugins() {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          IEnumerable<Plugin> msg = service.Obj.GetPlugins();
-          return msg;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
+      catch (Exception ex) {
+        HandleNetworkError(ex);
+        return default(T);
       }
-    }
-
-    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          Guid msg = service.Obj.AddChildJob(parentJobId, job, jobData);
-          return msg;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return new Guid();
-        }
-      }
-    }
-
-    public IEnumerable<JobData> GetChildJobs(Guid? parentJobId) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          IEnumerable<LightweightJob> msg = service.Obj.GetLightweightChildJobs(parentJobId, false, false);
-
-          List<JobData> jobs = new List<JobData>();
-          foreach (LightweightJob ljob in msg)
-            jobs.Add(service.Obj.GetJobData(ljob.Id));
-
-          return jobs;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
-      }
-    }
-
-    public void DeleteChildJobs(Guid jobId) {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          service.Obj.DeleteChildJobs(jobId);
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-        }
-      }
-    }
-
-    private static Disposable<IHiveService> GetSlaveService() {
-      return ServiceLocator.Instance.GetService("hiveslave", "hiveslave");
     }
   }