Changeset 9394

Timestamp:

04/23/13 18:39:52 (12 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:

• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)

branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/Properties/Settings.settings

@@ -1 +1 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>

branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config

@@ -3 +3 @@
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+      <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" />
       <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" />
       <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" />
@@ -54 +55 @@
   
   <userSettings>
-    <HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties.Settings>
+    <HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings>
       <setting name="NumberOfSlaves" serializeAs="String">
         <value>16</value>
       </setting>
-    </HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner.Properties.Settings>
+    </HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings>
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
       <setting name="HeartbeatInterval" serializeAs="String">

branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -240 +240 @@
         task = wcfService.GetTask(taskId);
         if (task == null) throw new TaskNotFoundException(taskId);
-        if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
-        if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
+        //if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
+        //if (ConfigManager.Instance.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
         SlaveStatusInfo.IncrementUsedCores(task.CoresNeeded); usedCores = task.CoresNeeded;
         TaskData taskData = wcfService.GetTaskData(taskId);

branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

@@ -82 +82 @@
 
     private void RunHeartBeatThread() {
+      Thread.Sleep(new Random().Next((int)Interval.TotalMilliseconds));
+
       while (!threadStopped) {
         try {