Changeset 5593 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

03/02/11 15:23:59 (14 years ago)

Author:

cneumuel

Message:

#1233

• changed the way lifecycle methods are called. The new service method TriggerLifecycle checks when the latest cleanup was made and performs one (if necessary). This can also be called by an external program (like a windows task)
• robustified logging

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.LifecycleClient (added)
• HeuristicLab.Clients.Hive.LifecycleClient/HeuristicLab.Clients.Hive.LifecycleClient.csproj (added)
• HeuristicLab.Clients.Hive.LifecycleClient/Program.cs (added)
• HeuristicLab.Clients.Hive.LifecycleClient/Properties (added)
• HeuristicLab.Clients.Hive.LifecycleClient/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Clients.Hive.LifecycleClient/app.config (added)
• HeuristicLab.Clients.Hive.LifecycleClient/app_ascheibe.config (added)
• HeuristicLab.Clients.Hive.LifecycleClient/app_f005pc.config (added)
• HeuristicLab.Clients.Hive.LifecycleClient/app_services.config (added)
• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• HeuristicLab.Hive 3.4.sln (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/Logger.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout (modified) (6 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Interfaces/IHiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Tests/ServiceTests.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.4/Interfaces/ILifecycleManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.4/LifecycleManager.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs

@@ -335 +335 @@
     #endregion
 
+    #region Lifecycle Methods
+    public void TriggerLifecycle() {
+      throw new NotImplementedException();
+    }
+    #endregion
   }
 }

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

@@ -124 +124 @@
     <Compile Include="StatusCommons.cs" />
     <Compile Include="WcfService.cs" />
+    <None Include="app.config" />
     <None Include="app_ascheibe.config" />
     <None Include="app_f005pc.config" />

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

@@ -72 +72 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DayView-1.0", "HeuristicLab.ExtLibs\HeuristicLab.DayView\1.0\HeuristicLab.DayView-1.0.csproj", "{02766ECC-D0F5-4115-9ECA-47409167B638}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateEventLogSources", "CreateEventLogSources\CreateEventLogSources.csproj", "{A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.LifecycleClient", "HeuristicLab.Clients.Hive.LifecycleClient\HeuristicLab.Clients.Hive.LifecycleClient.csproj", "{54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}"
 EndProject
 Global
@@ -311 +315 @@
     {02766ECC-D0F5-4115-9ECA-47409167B638}.Release|x86.ActiveCfg = Release|x86
     {02766ECC-D0F5-4115-9ECA-47409167B638}.Release|x86.Build.0 = Release|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|x64.ActiveCfg = Debug|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|x86.ActiveCfg = Debug|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Debug|x86.Build.0 = Debug|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Release|Any CPU.ActiveCfg = Release|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Release|Mixed Platforms.Build.0 = Release|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Release|x64.ActiveCfg = Release|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Release|x86.ActiveCfg = Release|x86
+    {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB}.Release|x86.Build.0 = Release|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|x64.ActiveCfg = Debug|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|x86.ActiveCfg = Debug|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Debug|x86.Build.0 = Debug|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Release|Any CPU.ActiveCfg = Release|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Release|Mixed Platforms.Build.0 = Release|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Release|x64.ActiveCfg = Release|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Release|x86.ActiveCfg = Release|x86
+    {54491B6A-1EDD-4C76-90A7-338BA9C1FBF8}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/Logger.cs

@@ -1 +1 @@
 using System;
 using System.Diagnostics;
+using System.Security;
+using System.Threading;
 
 namespace HeuristicLab.Services.Hive.Common {
@@ -17 +19 @@
     private EventLog log;
 
+    /// <summary>
+    /// Creating an EventSource requires certain permissions, which by default a IIS AppPool user does not have.
+    /// In this case just ignore security exceptions.
+    /// In order to make this work, the eventsource needs to be created manually
+    /// </summary>
     public Logger(string name, string source) {
-      //if (!EventLog.SourceExists(name)) {
-      //  EventLog.CreateEventSource(source, name);
-      //}
-      //log = new EventLog(name);
-      //log.Source = source;
+      try {
+        if (!EventLog.SourceExists(source)) {
+          EventLog.CreateEventSource(source, name);
+        }
+        log = new EventLog(name);
+        log.Source = source;
+      }
+      catch (SecurityException) { }
     }
 
     public void Log(string message) {
-      //log.WriteEntry(string.Format("{0} (AppDomain: {1}, Thread: {2})", message, AppDomain.CurrentDomain.Id, Thread.CurrentThread.ManagedThreadId), EventLogEntryType.Information);
+      try {
+        log.WriteEntry(string.Format("{0} (AppDomain: {1}, Thread: {2})", message, AppDomain.CurrentDomain.Id, Thread.CurrentThread.ManagedThreadId), EventLogEntryType.Information);
+      }
+      catch (SecurityException) { }
     }
 
     public void Error(Exception e) {
-      //log.WriteEntry(string.Format("{0} (AppDomain: {1}, Thread: {2})", e.Message, AppDomain.CurrentDomain.Id, Thread.CurrentThread.ManagedThreadId), EventLogEntryType.Error);
+      try {
+        log.WriteEntry(string.Format("{0} (AppDomain: {1}, Thread: {2})", e.Message, AppDomain.CurrentDomain.Id, Thread.CurrentThread.ManagedThreadId), EventLogEntryType.Error);
+      }
+      catch (SecurityException) { }
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

@@ -135 +135 @@
     Guid GetResourceId(string resourceName);
 
+    [OperationContract]
+    void TriggerLifecycle();
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDao.cs

@@ -558 +558 @@
     #endregion
 
+    #region Lifecycle Methods
+    public DateTime GetLastCleanup() {
+      using (var db = CreateContext()) {
+        var entity = db.Lifecycles.SingleOrDefault();
+        return entity != null ? entity.LastCleanup : DateTime.MinValue;
+      }
+    }
+
+    public void SetLastCleanup(DateTime datetime) {
+      using (var db = CreateContext()) {
+        var entity = db.Lifecycles.SingleOrDefault();
+        if (entity != null) {
+          entity.LastCleanup = datetime;
+        } else {
+          entity = new Lifecycle();
+          entity.LifecycleId = 0; // always only one entry with ID:0
+          entity.LastCleanup = datetime;
+          db.Lifecycles.InsertOnSubmit(entity);
+        }
+        db.SubmitChanges();
+      }
+    }
+    #endregion
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml

@@ -143 +143 @@
     </Type>
   </Table>
+  <Table Name="" Member="Lifecycles">
+    <Type Name="Lifecycle">
+      <Column Name="LifecycleId" Type="System.Int32" DbType="Int" IsPrimaryKey="true" CanBeNull="false" />
+      <Column Name="LastCleanup" Type="System.DateTime" DbType="DateTime" CanBeNull="false" />
+    </Type>
+  </Table>
 </Database>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.dbml.layout

@@ -83 +83 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(7.4687475 : 3.73240397135417); (7.4687475 : 5.5)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(7.4687475 : 3.73240397135417); (7.4687475 : 5.5)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
       <nodes>
@@ -104 +104 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 3.17870198567708); (6.125 : 3.17870198567708)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(6.5 : 3.17870198567708); (6.125 : 3.17870198567708)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_HiveExperiment" />
       <nodes>
@@ -130 +130 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(6.5 : 1.69314697265625); (6.125 : 1.69314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_JobData" />
       <nodes>
@@ -163 +163 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(6.5 : 2.50564697265625); (3.75 : 2.50564697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(6.5 : 2.50564697265625); (3.75 : 2.50564697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_StateLog" />
       <nodes>
@@ -170 +170 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(11.25 : 1.78929768880208); (10.9375 : 1.78929768880208); (10.9375 : 0.6875); (2.75 : 0.6875); (2.75 : 1)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(11.25 : 1.78929768880208); (10.9375 : 1.78929768880208); (10.9375 : 0.6875); (2.75 : 0.6875); (2.75 : 1)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_StateLog" />
       <nodes>
@@ -184 +184 @@
       </nodes>
     </associationConnector>
+    <classShape Id="b4e7aaa8-a382-4560-a1fd-498de77e9340" absoluteBounds="1.75, 5.5, 2, 1.1939925130208327">
+      <DataClassMoniker Name="/HiveDataContext/Lifecycle" />
+      <nestedChildShapes>
+        <elementListCompartment Id="03597a2c-5c5d-4c2c-b741-c49ab5aa34d5" absoluteBounds="1.7650000000000001, 5.96, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+      </nestedChildShapes>
+    </classShape>
   </nestedChildShapes>
 </ordesignerObjectsDiagram>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HiveDataContext.designer.cs

@@ -64 +64 @@
     partial void UpdateHiveExperimentPermission(HiveExperimentPermission instance);
     partial void DeleteHiveExperimentPermission(HiveExperimentPermission instance);
+    partial void InsertLifecycle(Lifecycle instance);
+    partial void UpdateLifecycle(Lifecycle instance);
+    partial void DeleteLifecycle(Lifecycle instance);
     #endregion
     
@@ -175 +178 @@
       {
         return this.GetTable<HiveExperimentPermission>();
+      }
+    }
+    
+    public System.Data.Linq.Table<Lifecycle> Lifecycles
+    {
+      get
+      {
+        return this.GetTable<Lifecycle>();
       }
     }
@@ -3190 +3201 @@
     }
   }
+  
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
+  public partial class Lifecycle : INotifyPropertyChanging, INotifyPropertyChanged
+  {
+    
+    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+    
+    private int _LifecycleId;
+    
+    private System.DateTime _LastCleanup;
+    
+    #region Extensibility Method Definitions
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnLifecycleIdChanging(int value);
+    partial void OnLifecycleIdChanged();
+    partial void OnLastCleanupChanging(System.DateTime value);
+    partial void OnLastCleanupChanged();
+    #endregion
+    
+    public Lifecycle()
+    {
+      OnCreated();
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LifecycleId", DbType="Int", IsPrimaryKey=true)]
+    public int LifecycleId
+    {
+      get
+      {
+        return this._LifecycleId;
+      }
+      set
+      {
+        if ((this._LifecycleId != value))
+        {
+          this.OnLifecycleIdChanging(value);
+          this.SendPropertyChanging();
+          this._LifecycleId = value;
+          this.SendPropertyChanged("LifecycleId");
+          this.OnLifecycleIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastCleanup", DbType="DateTime")]
+    public System.DateTime LastCleanup
+    {
+      get
+      {
+        return this._LastCleanup;
+      }
+      set
+      {
+        if ((this._LastCleanup != value))
+        {
+          this.OnLastCleanupChanging(value);
+          this.SendPropertyChanging();
+          this._LastCleanup = value;
+          this.SendPropertyChanged("LastCleanup");
+          this.OnLastCleanupChanged();
+        }
+      }
+    }
+    
+    public event PropertyChangingEventHandler PropertyChanging;
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    
+    protected virtual void SendPropertyChanging()
+    {
+      if ((this.PropertyChanging != null))
+      {
+        this.PropertyChanging(this, emptyChangingEventArgs);
+      }
+    }
+    
+    protected virtual void SendPropertyChanged(String propertyName)
+    {
+      if ((this.PropertyChanged != null))
+      {
+        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+      }
+    }
+  }
 }
 #pragma warning restore 1591

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Interfaces/IHiveDao.cs

@@ -100 +100 @@
     Guid GetExperimentForJob(Guid jobId);
     #endregion
+
+    #region Lifecycle Methods
+    DateTime GetLastCleanup();
+    void SetLastCleanup(DateTime datetime);
+    #endregion
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/Mocks/MockLifecycleManager.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
 
 namespace HeuristicLab.Services.Hive.Tests.Mocks {
   public class MockLifecycleManager : ILifecycleManager {
-
-    public void Start() { }
-
-    public void Stop() { }
+    public void Cleanup() { }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
@@ -242 +241 @@
 
       // lifecycle - let it process one server-heartbeat; the parent job must NOT be set to finished
-      var lifecycleManager = new LifecycleManager();
-      lifecycleManager.Start();
-      Thread.Sleep(1000);
-      lifecycleManager.Stop();
+      service.TriggerLifecycle();
 
       parentJobLoaded = service.GetJob(parentJob.Id);
@@ -255 +251 @@
 
       // lifecycle - let it process one server-heartbeat; this should set the parent job to finished
-      lifecycleManager.Start();
-      Thread.Sleep(1000);
-      lifecycleManager.Stop();
+      service.TriggerLifecycle();
 
       // test if parent job is finished

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

@@ -70 +70 @@
 
   <system.webServer>
-    <modules runAllManagedModulesForAllRequests="true">
+    <!--<modules runAllManagedModulesForAllRequests="true">
       <add name="HiveServerModule" type="HeuristicLab.Services.Hive.IISModules.HiveServerModule"/>
-    </modules>
+    </modules>-->
     <directoryBrowse enabled="true"/>
   </system.webServer>

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

@@ -115 +115 @@
     <Compile Include="Interfaces\ILifecycleManager.cs" />
     <Compile Include="Interfaces\IServiceLocator.cs" />
-    <Compile Include="Standalone\HeuristicLabServicesHiveApplication.cs" />
-    <Compile Include="Standalone\MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Standalone\MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="AuthorizationManager.cs" />
     <Compile Include="HeuristicLabServicesHivePlugin.cs" />
@@ -148 +141 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Standalone\MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </EmbeddedResource>
+    <Folder Include="Standalone\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -229 +229 @@
     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
+      TriggerLifecycle();
+
       using (trans.OpenTransaction()) {
         return heartbeatManager.ProcessHeartbeat(heartbeat);
@@ -255 +257 @@
     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     public IEnumerable<Plugin> GetPlugins() {
-      return dao.GetPlugins(x => true);
+      return dao.GetPlugins(x => x.IsLocal == false);
     }
 
@@ -382 +384 @@
       }
     }
+
+    public void TriggerLifecycle() {
+      using (trans.OpenTransaction()) {
+        DateTime lastCleanup = dao.GetLastCleanup();
+        if (DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
+          dao.SetLastCleanup(DateTime.Now);
+          lifecycleManager.Cleanup();
+        }
+      }
+    }
     #endregion
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/ILifecycleManager.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
-
+
 namespace HeuristicLab.Services.Hive {
   /// <summary>
@@ -11 +5 @@
   /// </summary>
   public interface ILifecycleManager {
-    void Start();
-
-    void Stop();
+    void Cleanup();
   }
 }

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

@@ -1 +1 @@
 using System;
 using System.Linq;
-using HeuristicLab.Core;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
@@ -7 +6 @@
 namespace HeuristicLab.Services.Hive {
   /// <summary>
-  /// This class holds the state of all recent heartbeats and decides to reschedule jobs and set slaves offline
+  /// This class offers methods for cleaning up offline slaves and jobs
   /// </summary>
   public class LifecycleManager : ILifecycleManager {
@@ -19 +18 @@
       get { return ServiceLocator.Instance.AuthorizationManager; }
     }
-
-    private static object locker = new object();
-
-    // Windows-Forms timer is single threaded, so callbacks will be synchron
-    private System.Windows.Forms.Timer timer;
-
-    public ExecutionState ExecutionState {
-      get { return timer.Enabled ? ExecutionState.Started : Core.ExecutionState.Stopped; }
+    private ILogger log {
+      get { return LogFactory.GetLogger(this.GetType().Namespace); }
     }
 
-    public LifecycleManager() {
-      this.timer = new System.Windows.Forms.Timer();
-      this.timer.Tick += new EventHandler(timer_Tick);
-    }
-
-    public void Start() {
-      if (ExecutionState == Core.ExecutionState.Stopped) {
-        // kick off the event immediately
-        timer_Tick(this, EventArgs.Empty);
-
-        // start the timer
-        this.timer.Interval = (int)new TimeSpan(0, 0, 30).TotalMilliseconds;
-        this.timer.Start();
-      }
-    }
-
-    public void Stop() {
-      if (ExecutionState == Core.ExecutionState.Started) {
-        timer.Stop();
-      }
-    }
-
-    /// <summary>
-    /// This method is supposed to check if slaves are online
-    /// if not -> set them offline and check if they where calculating a job
-    /// </summary>
-    private void timer_Tick(object sender, EventArgs e) {
-      lock (locker) {
-        using (trans.OpenTransaction()) {
-          SetTimeoutSlavesOffline();
-          FinishParentJobs();
-        }
-      }
+    public void Cleanup() {
+      log.Log("LifecycleManager.Cleanup()");
+      SetTimeoutSlavesOffline();
+      FinishParentJobs();
     }
 
@@ -101 +65 @@
       }
     }
+
   }
 }