Changeset 5181 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3

Timestamp:

12/29/10 15:50:03 (14 years ago)

Author:

cneumuel

Message:

#1260

• refined job-downloads for limited resources
• fixed minor bugs

Location:

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3

Files:

• ConfigurationManager/ConfigManager.cs (modified) (1 diff)
• HeartbeatManager.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs

@@ -104 +104 @@
     }
 
-    public Dictionary<Guid, TimeSpan> GetExecutionTimeOfAllJobs() {
+    public Dictionary<Guid, TimeSpan> GetExecutionTimeOfRunningJobs() {
       Dictionary<Guid, TimeSpan> prog = new Dictionary<Guid, TimeSpan>();
       Dictionary<Guid, Executor> engines = Core.ExecutionEngines;
       lock (engines) {
         foreach (KeyValuePair<Guid, Executor> kvp in engines) {
-          Executor e = kvp.Value;
-          prog[e.JobId] = e.ExecutionTime;
+          if (kvp.Value.ExecutionState == HeuristicLab.Core.ExecutionState.Started) { // only report from started jobs. this ensures that hung jobs will get an abort after some timeout. also if a job is already prepared (after it stopped), the executionTime would be 00:00:00
+            Executor e = kvp.Value;
+            prog[e.JobId] = e.ExecutionTime;
+          }
         }
       }

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeartbeatManager.cs

@@ -98 +98 @@
                 FreeCores = info.NrOfCores.HasValue ? info.NrOfCores.Value - ConfigManager.Instance.GetUsedCores() : 0,
                 FreeMemory = GetFreeMemory(),
-                JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs(),
+                JobProgress = ConfigManager.Instance.GetExecutionTimeOfRunningJobs(),
                 IsAllowedToCalculate = UptimeManager.Instance.IsAllowedToCalculate() && UptimeManager.Instance.CalendarAvailable
               };