Changeset 6717 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

Timestamp:

09/08/11 10:38:36 (13 years ago)

Author:

ascheibe

Message:

#1233

• moved DTO's to Services.Hive project
• removed Services.Hive.Common project
• some cleanups
• added DTO's for enums

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (6 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.Services.Hive.DataAccess;
+using HeuristicLab.Services.Hive.DataAccess;
+using DT = HeuristicLab.Services.Hive.DataTransfer;
+
 
 namespace HeuristicLab.Services.Hive {
@@ -31 +33 @@
   /// </summary>
   public class EventManager : IEventManager {
-    private DataAccess.IHiveDao dao {
+    private IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
     }
@@ -52 +54 @@
       var slaves = dao.GetSlaves(x => x.SlaveState == SlaveState.Calculating || x.SlaveState == SlaveState.Idle);
 
-      var stats = new Statistics();
+      var stats = new DataTransfer.Statistics();
       stats.TimeStamp = DateTime.Now;
-      var slaveStats = new List<SlaveStatistics>();
+      var slaveStats = new List<DT.SlaveStatistics>();
       foreach (var slave in slaves) {
-        slaveStats.Add(new SlaveStatistics() {
+        slaveStats.Add(new DT.SlaveStatistics() {
           SlaveId = slave.Id,
           Cores = slave.Cores.HasValue ? slave.Cores.Value : 0,
@@ -75 +77 @@
     private void SetTimeoutSlavesOffline() {
       var slaves = dao.GetSlaves(x => x.SlaveState != SlaveState.Offline);
-      foreach (Slave slave in slaves) {
-        if (!slave.LastHeartbeat.HasValue || (DateTime.Now - slave.LastHeartbeat.Value) > Settings.Default.SlaveHeartbeatTimeout) {
-          slave.SlaveState = SlaveState.Offline;
+      foreach (DT.Slave slave in slaves) {
+        if (!slave.LastHeartbeat.HasValue || (DateTime.Now - slave.LastHeartbeat.Value) > HeuristicLab.Services.Hive.Properties.Settings.Default.SlaveHeartbeatTimeout) {
+          slave.SlaveState = DT.SlaveState.Offline;
           SetJobsWaiting(slave.Id);
           dao.UpdateSlave(slave);
@@ -97 +99 @@
       var jobs = dao.GetJobs(x => x.State == JobState.Calculating).Where(x => x.StateLog.Last().SlaveId == slaveId);
       foreach (var j in jobs) {
-        Job job = dao.UpdateJobState(j.Id, JobState.Waiting, slaveId, null, "Slave timed out.");
+        DT.Job job = dao.UpdateJobState(j.Id, JobState.Waiting, slaveId, null, "Slave timed out.");
         job.Command = null;
         dao.UpdateJob(job);
@@ -107 +109 @@
     /// </summary>
     private void SetTimeoutJobsWaiting() {
-      var jobs = dao.GetJobs(x => (x.State == JobState.Calculating && (DateTime.Now - x.LastHeartbeat) > Settings.Default.CalculatingJobHeartbeatTimeout)
-                               || (x.State == JobState.Transferring && (DateTime.Now - x.LastHeartbeat) > Settings.Default.TransferringJobHeartbeatTimeout));
+      var jobs = dao.GetJobs(x => (x.State == JobState.Calculating && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.CalculatingJobHeartbeatTimeout)
+                               || (x.State == JobState.Transferring && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.TransferringJobHeartbeatTimeout));
       foreach (var j in jobs) {
-        Job job = dao.UpdateJobState(j.Id, JobState.Waiting, null, null, "Slave timed out.");
+        DT.Job job = dao.UpdateJobState(j.Id, JobState.Waiting, null, null, "Slave timed out.");
         job.Command = null;
         dao.UpdateJob(job);