Changeset 9394


Ignore:
Timestamp:
04/23/13 18:39:52 (7 years ago)
Author:
pfleck
Message:

#2030
Fixed amespace bug in ConfigFile.
Disabled OutOfCoreExeption and OutOfMemoryException for MultiSlave-testing.
Added random waiting time for HartbeatManager to start to avoid simultaneously heartbeats for MultiSlave-testing.

Location:
branches/HivePerformance/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties/Settings.settings

    r9373 r9394  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config

    r9373 r9394  
    33  <configSections>
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    56      <section name="HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    67      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     
    5455 
    5556  <userSettings>
    56     <HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties.Settings>
     57    <HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings>
    5758      <setting name="NumberOfSlaves" serializeAs="String">
    5859        <value>16</value>
    5960      </setting>
    60     </HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties.Settings>
     61    </HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings>
    6162    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    6263      <setting name="HeartbeatInterval" serializeAs="String">
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

    r9347 r9394  
    240240        task = wcfService.GetTask(taskId);
    241241        if (task == null) throw new TaskNotFoundException(taskId);
    242         if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
    243         if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
     242        //if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
     243        //if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
    244244        SlaveStatusInfo.IncrementUsedCores(task.CoresNeeded); usedCores = task.CoresNeeded;
    245245        TaskData taskData = wcfService.GetTaskData(taskId);
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

    r9347 r9394  
    8282
    8383    private void RunHeartBeatThread() {
     84      Thread.Sleep(new Random().Next((int)Interval.TotalMilliseconds));
     85
    8486      while (!threadStopped) {
    8587        try {
Note: See TracChangeset for help on using the changeset viewer.