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

Timestamp:

10/09/11 01:47:51 (13 years ago)

Author:

ascheibe

Message:

#1233 server can now control the slave heartbeat interval

Location:

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

Files:

• Core.cs (modified) (1 diff)
• Manager/HeartbeatManager.cs (modified) (4 diffs)
• WcfService.cs (modified) (1 diff)

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

@@ -189 +189 @@
             wcfService.Connect(configManager.GetClientInfo());
             break;
+          case MessageContainer.MessageType.NewHBInterval:
+            int interval = wcfService.GetNewHeartbeatInterval(ConfigManager.Instance.GetClientInfo().Id);
+            if (interval != -1) {
+              HeartbeatManager.Interval = TimeSpan.FromSeconds(interval);
+            }
+            break;
         }
       } else {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

@@ -33 +33 @@
   public class HeartbeatManager {
     private static object locker = new object();
-    public TimeSpan Interval { get; set; }
+    private TimeSpan interval;
+
+    public TimeSpan Interval {
+      get { return interval; }
+      set {
+        interval = value;
+        Settings.Default.HeartbeatInterval = interval;
+        Settings.Default.Save();
+      }
+    }
     private Thread heartBeatThread;
     private AutoResetEvent waitHandle;
@@ -40 +49 @@
 
     public HeartbeatManager() {
-      Interval = Settings.Default.HeartbeatInterval;
+      interval = Settings.Default.HeartbeatInterval;
     }
 
@@ -91 +100 @@
                 CpuUtilization = ConfigManager.Instance.GetCpuUtilization(),
                 JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs(),
-                AssignJob = !ConfigManager.Instance.Asleep
+                AssignJob = !ConfigManager.Instance.Asleep,
+                HbInterval = (int)interval.TotalSeconds
               };
 
@@ -112 +122 @@
           OnExceptionOccured(e);
         }
-        waitHandle.WaitOne(this.Interval);
+        waitHandle.WaitOne(this.interval);
       }
       waitHandle.Close();

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

@@ -144 +144 @@
     }
 
+    public int GetNewHeartbeatInterval(Guid id) {
+      int ret = -1;
+      CallHiveService(s => ret = s.GetNewHeartbeatInterval(id));
+      return ret;
+    }
+
     /// <summary>
     /// Network communication error handler.