Changeset 12694 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Hive/3.3/Manager

Timestamp:

07/09/15 13:07:30 (10 years ago)

Author:

abeham

Message:

#2208: merged trunk changes

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• . (modified) (2 props)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -122 +122 @@
     /// </summary>
     private void DeleteObsoleteSlaves() {
-      var slaves = dao.GetSlaves(x => x.IsDisposable.GetValueOrDefault() && x.SlaveState == SlaveState.Offline && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.SweepInterval);
-      foreach (DT.Slave slave in slaves) dao.DeleteSlave(slave.Id);
+      var slaves = dao.GetSlaves(x => x.IsDisposable.GetValueOrDefault() &&
+                                      x.SlaveState == SlaveState.Offline &&
+                                      (DateTime.Now - x.LastHeartbeat) > Hive.Properties.Settings.Default.SweepInterval)
+                                .Select(x => x.Id)
+                                .ToArray();
+
+      foreach (Guid slaveId in slaves) {
+        var downtimesAvailable = dao.GetDowntimes(x => x.ResourceId == slaveId).Any();
+        if (!downtimesAvailable) {
+          dao.DeleteSlave(slaveId);
+        }
+      }
     }
   }

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.