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

Timestamp:

03/02/11 15:23:59 (13 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/HeuristicLab.Services.Hive/3.4

Files:

• HeuristicLab.Services.Hive-3.4.csproj (modified) (2 diffs)
• HiveService.cs (modified) (3 diffs)
• Interfaces/ILifecycleManager.cs (modified) (2 diffs)
• LifecycleManager.cs (modified) (4 diffs)

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 @@
       }
     }
+
   }
 }