Changeset 5718 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

03/16/11 17:02:15 (13 years ago)

Author:

cneumuel

Message:

#1233

• fixed statelog when time on server differs from slave or client
• fixed wrong creation of childjobs in experiment manager
• made ganttchardview the default view for statelogs

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Files:

• HeartbeatManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive-3.4.csproj (modified) (1 diff)
• LifecycleManager.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs

@@ -4 +4 @@
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Services.Hive {
@@ -73 +72 @@
           // job does not exist in db
           actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, jobProgress.Key));
-          Logger.Error("Job does not exist in DB: " + jobProgress.Key);
+          LogFactory.GetLogger(this.GetType().Namespace).Log("Job does not exist in DB: " + jobProgress.Key);
         } else {
           if (curJob.CurrentStateLog.SlaveId == Guid.Empty || curJob.CurrentStateLog.SlaveId != heartbeat.SlaveId) {
             // assigned slave does not match heartbeat
             actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            Logger.Error("The slave " + heartbeat.SlaveId + " is not supposed to calculate Job: " + curJob);
+            LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate Job: " + curJob);
           } else {
             // save job execution time

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj

@@ -91 +91 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs

@@ -55 +55 @@
       var jobs = dao.GetJobs(x => x.State == JobState.Calculating).Where(x => x.StateLog.Last().SlaveId == slaveId);
       foreach (var j in jobs) {
-        j.StateLog.Add(new StateLog() { 
-          State = JobState.Waiting,
-          JobId = j.Id,
-          DateTime = DateTime.Now,
-          Exception = "Slave timed out"
-        });
-        dao.UpdateJob(j);
+        dao.UpdateJobState(j.Id, JobState.Waiting, slaveId, null, "Slave timed out");
       }
     }