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

Timestamp:

02/01/11 18:12:46 (13 years ago)

Author:

cneumuel

Message:

#1233

• moved heartbeat timestamps of slaves and jobs into database to make server stateless
• made slave use the right authentication ("hiveslave" instead of HL username/password)
• moved heartbeat related methods into HeartbeatManager
• changed signature of Service.Hello method, so all hardware related information is transferred in that method withing the Slave-object

File:

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

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

@@ -75 +75 @@
     /// </summary>
     public void Connect(HeuristicLab.Services.Hive.Common.DataTransfer.Slave slaveInfo) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           ConnState = NetworkEnum.WcfConnState.Connected;
           ConnectedSince = DateTime.Now;
-          service.Obj.Hello(slaveInfo.Id/*Settings.Default.Guid*/, slaveInfo.Name, slaveInfo.Cores.Value, slaveInfo.Memory.Value);
+          service.Obj.Hello(slaveInfo);
           OnConnected();
         }
@@ -92 +92 @@
     /// </summary>
     public void Disconnect() {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           service.Obj.GoodBye(ConfigManager.Instance.GetClientInfo().Id);
@@ -116 +116 @@
     /// </summary>
     public Job GetJob(Guid jobId) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           Job job = service.Obj.GetJob(jobId);
@@ -129 +129 @@
 
     public JobData GetJobData(Guid jobId) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           JobData jobData = service.Obj.GetJobData(jobId);
@@ -147 +147 @@
     /// <param name="jobData"></param>    
     public void UpdateJob(Job job, JobData jobData) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           service.Obj.UpdateJob(job, jobData);
@@ -158 +158 @@
 
     public List<MessageContainer> SendHeartbeat(Heartbeat heartbeat) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           List<MessageContainer> msg = service.Obj.Heartbeat(heartbeat);
@@ -171 +171 @@
 
     public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           IEnumerable<PluginData> msg = service.Obj.GetPluginDatas(pluginIds);
@@ -184 +184 @@
 
     public IEnumerable<Plugin> GetPlugins() {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           IEnumerable<Plugin> msg = service.Obj.GetPlugins();
@@ -197 +197 @@
 
     public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           Guid msg = service.Obj.AddChildJob(parentJobId, job, jobData);
@@ -210 +210 @@
 
     public IEnumerable<JobData> GetChildJobs(Guid? parentJobId) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           IEnumerable<LightweightJob> msg = service.Obj.GetLightweightChildJobs(parentJobId, false, false);
@@ -228 +228 @@
 
     public void DeleteChildJobs(Guid jobId) {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           service.Obj.DeleteChildJobs(jobId);
@@ -239 +239 @@
 
     public PluginData GetConfigurationFile() {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+      using (Disposable<IHiveService> service = GetSlaveService()) {
         try {
           PluginData msg = service.Obj.GetConfigurationFile();
@@ -249 +249 @@
         }
       }
+    }
+
+    private static Disposable<IHiveService> GetSlaveService() {
+      return ServiceLocator.Instance.GetService("hiveslave", "hiveslave");
     }
   }