Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7189 for trunk


Ignore:
Timestamp:
12/14/11 16:42:12 (12 years ago)
Author:
ascheibe
Message:

#1672

  • increased timeout for slaves/tasks to 3 minutes
  • moved the cleanup functionality to an own windows service. This will hopefully increase performance because it was done within the heartbeat calls up until now.
Location:
trunk/sources
Files:
19 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3 Services.sln

    r7170 r7189  
    4343    DefaultWebSiteLanguage = "Visual C#"
    4444  EndProjectSection
     45EndProject
     46Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.JanitorService-3.3", "HeuristicLab.Services.Hive.JanitorService\3.3\HeuristicLab.Services.Hive.JanitorService-3.3.csproj", "{F685556B-F6EB-4143-8E7E-662D00FDD299}"
     47EndProject
     48Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Services.Hive.JanitorServiceSetup-3.3", "HeuristicLab.Services.Hive.JanitorServiceSetup\HeuristicLab.Services.Hive.JanitorServiceSetup-3.3.vdproj", "{034C2EE4-E303-4E45-98AB-F0074EC83B81}"
    4549EndProject
    4650Global
    … …  
    118122    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}.Release|x86.Build.0 = Release|x86
    119123    {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     124    {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
    120125    {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|x64.ActiveCfg = Debug|Any CPU
    121126    {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Debug|x86.ActiveCfg = Debug|Any CPU
    … …  
    123128    {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Release|x64.ActiveCfg = Debug|Any CPU
    124129    {0CA6706D-A569-45DE-A85C-4158891CC1BC}.Release|x86.ActiveCfg = Debug|Any CPU
     130    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     131    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|Any CPU.Build.0 = Debug|Any CPU
     132    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x64.ActiveCfg = Debug|x64
     133    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x64.Build.0 = Debug|x64
     134    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x86.ActiveCfg = Debug|x86
     135    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Debug|x86.Build.0 = Debug|x86
     136    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|Any CPU.ActiveCfg = Release|Any CPU
     137    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|Any CPU.Build.0 = Release|Any CPU
     138    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x64.ActiveCfg = Release|x64
     139    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x64.Build.0 = Release|x64
     140    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.ActiveCfg = Release|x86
     141    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.Build.0 = Release|x86
     142    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.ActiveCfg = Debug
     143    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.Build.0 = Debug
     144    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x64.ActiveCfg = Debug
     145    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x64.Build.0 = Debug
     146    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x86.ActiveCfg = Debug
     147    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x86.Build.0 = Debug
     148    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|Any CPU.ActiveCfg = Release
     149    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|Any CPU.Build.0 = Release
     150    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x64.ActiveCfg = Release
     151    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x64.Build.0 = Release
     152    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x86.ActiveCfg = Release
     153    {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x86.Build.0 = Release
    125154  EndGlobalSection
    126155  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

    r6983 r7189  
    136136    <Compile Include="DataTransfer\UserStatistics.cs" />
    137137    <Compile Include="HiveDao.cs" />
     138    <Compile Include="HiveJanitor.cs" />
    138139    <Compile Include="Interfaces\IHiveDao.cs" />
    139140    <Compile Include="Interfaces\IUserManager.cs" />
    140141    <Compile Include="Manager\UserManager.cs" />
    141142    <Compile Include="Settings.cs" />
     143    <None Include="app.config" />
    142144    <None Include="Plugin.cs.frame" />
    143145    <None Include="Properties\AssemblyInfo.cs.frame" />

  • trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

    r7187 r7189  
    396396    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
    397397      authen.AuthenticateForAnyRole(HiveRoles.Slave);
    398       TriggerEventManager(false);
    399       return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
     398
     399      List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
     400
     401      if (HeuristicLab.Services.Hive.Properties.Settings.Default.TriggerEventManagerInHeartbeat) {
     402        TriggerEventManager(false);
     403      }
     404
     405      return result;
    400406    }
    401407    #endregion
    … …  
    562568      trans.UseTransaction(() => {
    563569        DateTime lastCleanup = dao.GetLastCleanup();
    564         if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(140)) {
     570        if (force || DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
    565571          dao.SetLastCleanup(DateTime.Now);
    566572          cleanup = true;

  • trunk/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs

    r6983 r7189  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.235
     4//     Runtime Version:4.0.30319.239
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    2626        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    28         [global::System.Configuration.DefaultSettingValueAttribute("00:01:00")]
     28        [global::System.Configuration.DefaultSettingValueAttribute("00:03:00")]
    2929        public global::System.TimeSpan SlaveHeartbeatTimeout {
    3030            get {
    … …  
    5050            }
    5151        }
     52       
     53        [global::System.Configuration.ApplicationScopedSettingAttribute()]
     54        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     55        [global::System.Configuration.DefaultSettingValueAttribute("False")]
     56        public bool TriggerEventManagerInHeartbeat {
     57            get {
     58                return ((bool)(this["TriggerEventManagerInHeartbeat"]));
     59            }
     60        }
     61       
     62        [global::System.Configuration.ApplicationScopedSettingAttribute()]
     63        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     64        [global::System.Configuration.DefaultSettingValueAttribute("00:03:00")]
     65        public global::System.TimeSpan CleanupInterval {
     66            get {
     67                return ((global::System.TimeSpan)(this["CleanupInterval"]));
     68            }
     69        }
    5270    }
    5371}

  • trunk/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.settings

    r6983 r7189  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Services.Hive.Common" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Services.Hive.Properties" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>
    55    <Setting Name="SlaveHeartbeatTimeout" Type="System.TimeSpan" Scope="Application">
    6       <Value Profile="(Default)">00:01:00</Value>
     6      <Value Profile="(Default)">00:03:00</Value>
    77    </Setting>
    88    <Setting Name="CalculatingJobHeartbeatTimeout" Type="System.TimeSpan" Scope="Application">
    … …  
    1212      <Value Profile="(Default)">00:05:30</Value>
    1313    </Setting>
     14    <Setting Name="TriggerEventManagerInHeartbeat" Type="System.Boolean" Scope="Application">
     15      <Value Profile="(Default)">False</Value>
     16    </Setting>
     17    <Setting Name="CleanupInterval" Type="System.TimeSpan" Scope="Application">
     18      <Value Profile="(Default)">00:03:00</Value>
     19    </Setting>
    1420  </Settings>
    1521</SettingsFile>
Note: See TracChangeset for help on using the changeset viewer.