Changeset 6456
- Timestamp:
- 06/20/11 16:57:04 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/HeuristicLab.Clients.Hive.Administration-3.4.csproj
r6418 r6456 204 204 </ItemGroup> 205 205 <ItemGroup> 206 <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.ExperimentManager\3.4\HeuristicLab.Clients.Hive.ExperimentManager-3.4.csproj">207 <Project>{DBFD7205-61AF-40EF-8776-3052DEF91CF3}</Project>208 <Name>HeuristicLab.Clients.Hive.ExperimentManager-3.4</Name>209 </ProjectReference>210 206 <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.4\HeuristicLab.Clients.Hive.Views-3.4.csproj"> 211 207 <Project>{E1D6C801-892A-406A-B606-F158E36DD3C3}</Project> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/HeuristicLabClientsHiveAdministrationPlugin.cs.frame
r6373 r6456 25 25 [Plugin("HeuristicLab.Clients.Hive.Administration", "3.4.0.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Clients.Hive.Administration-3.4.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Clients.Common", "3.3")] 28 [PluginDependency("HeuristicLab.Collections", "3.3")] 29 [PluginDependency("HeuristicLab.Common", "3.3")] 30 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 31 [PluginDependency("HeuristicLab.Core", "3.3")] 32 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 33 [PluginDependency("HeuristicLab.Data", "3.3")] 34 [PluginDependency("HeuristicLab.Hive", "3.4")] 35 [PluginDependency("HeuristicLab.Optimization", "3.3")] 36 [PluginDependency("HeuristicLab.Optimizer", "3.3")] 37 [PluginDependency("HeuristicLab.Persistence", "3.3")] 38 [PluginDependency("HeuristicLab.MainForm", "3.3")] 39 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 40 [PluginDependency("HeuristicLab.DayView", "1.0")] 27 41 public class HeuristicLabClientsHiveAdministrationPlugin : PluginBase { 28 42 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon.csproj
r6257 r6456 44 44 </PropertyGroup> 45 45 <ItemGroup> 46 <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.3">47 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.dll</HintPath>48 </Reference>49 46 <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 50 47 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/Program.cs
r6371 r6456 5 5 using System.Windows.Forms; 6 6 using HeuristicLab.Clients.Hive.SlaveCore.Views; 7 using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties; 7 8 8 9 namespace HeuristicLab.Clients.Hive.SlaveCore.SlaveTrayIcon { … … 13 14 [STAThread] 14 15 static void Main(string[] args) { 15 if (args.Length < 1 || (args.Length > 0 && args[0] != "showui")) {16 if (args.Length < 1 || (args.Length > 0 && args[0] != Settings.Default.ShowUICmd)) { 16 17 KillOtherInstances(); 17 18 } … … 20 21 Application.SetCompatibleTextRenderingDefault(false); 21 22 MainWindow mw = new MainWindow(); 22 if (args.Length < 1 || (args.Length > 0 && args[0] != "showui")) {23 if (args.Length < 1 || (args.Length > 0 && args[0] != Settings.Default.ShowUICmd)) { 23 24 mw.MinimizeToTray(); 24 } else if (args.Length > 0 && args[0] == "showui") {25 } else if (args.Length > 0 && args[0] == Settings.Default.ShowUICmd) { 25 26 mw.RestoreFromTray(); 26 27 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/Properties/Settings.Designer.cs
r6225 r6456 35 35 } 36 36 } 37 38 [global::System.Configuration.UserScopedSettingAttribute()] 39 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 40 [global::System.Configuration.DefaultSettingValueAttribute("showui")] 41 public string ShowUICmd { 42 get { 43 return ((string)(this["ShowUICmd"])); 44 } 45 set { 46 this["ShowUICmd"] = value; 47 } 48 } 49 50 [global::System.Configuration.UserScopedSettingAttribute()] 51 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 52 [global::System.Configuration.DefaultSettingValueAttribute("SlaveCommunicationServiceEndpoint")] 53 public string SlaveCommunicationServiceEndpoint { 54 get { 55 return ((string)(this["SlaveCommunicationServiceEndpoint"])); 56 } 57 set { 58 this["SlaveCommunicationServiceEndpoint"] = value; 59 } 60 } 37 61 } 38 62 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/Properties/Settings.settings
r6225 r6456 6 6 <Value Profile="(Default)">False</Value> 7 7 </Setting> 8 <Setting Name="ShowUICmd" Type="System.String" Scope="User"> 9 <Value Profile="(Default)">showui</Value> 10 </Setting> 11 <Setting Name="SlaveCommunicationServiceEndpoint" Type="System.String" Scope="User"> 12 <Value Profile="(Default)">SlaveCommunicationServiceEndpoint</Value> 13 </Setting> 8 14 </Settings> 9 15 </SettingsFile> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs
r6372 r6456 23 23 using System.ServiceModel; 24 24 using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts; 25 using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; … … 80 81 public void Open() { 81 82 try { 82 pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(this, "SlaveCommunicationServiceEndpoint");83 pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(this, Settings.Default.SlaveCommunicationServiceEndpoint); 83 84 RegisterEvents(); 84 85 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs
r6371 r6456 29 29 using System.Windows.Forms; 30 30 using System.Windows.Forms.DataVisualization.Charting; 31 using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties; 31 32 using HeuristicLab.Common; 32 33 using HeuristicLab.Core.Views; … … 245 246 private void ElevateApplication() { 246 247 // launch itself as administrator 247 ProcessStartInfo proc = new ProcessStartInfo(Application.ExecutablePath, "showui");248 ProcessStartInfo proc = new ProcessStartInfo(Application.ExecutablePath, Settings.Default.ShowUICmd); 248 249 proc.UseShellExecute = true; 249 250 proc.WorkingDirectory = Environment.CurrentDirectory; -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/app.config
r6225 r6456 11 11 <value>False</value> 12 12 </setting> 13 <setting name="ShowUICmd" serializeAs="String"> 14 <value>showui</value> 15 </setting> 16 <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String"> 17 <value>SlaveCommunicationServiceEndpoint</value> 18 </setting> 13 19 </HeuristicLab.Clients.Hive.SlaveCore.Views.Properties.Settings> 14 20 </userSettings> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs
r6381 r6456 108 108 //Initialize the heartbeat 109 109 if (heartbeatManager == null) { 110 heartbeatManager = new HeartbeatManager { Interval = new TimeSpan(0, 0, 10) };110 heartbeatManager = new HeartbeatManager(); 111 111 heartbeatManager.StartHeartbeat(); 112 112 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs
r6419 r6456 22 22 using System; 23 23 using System.Threading; 24 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; … … 83 84 84 85 job.Start(); 85 if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds( 25))) {86 if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(Settings.Default.ExecutorSemTimeouts))) { 86 87 jobDataInvalid = true; 87 88 throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired."); … … 98 99 IsPausing = true; 99 100 // wait until job is started. if this does not happen, the Job is null an we give up 100 jobStartedSem.WaitOne( TimeSpan.FromSeconds(15));101 jobStartedSem.WaitOne(Settings.Default.ExecutorSemTimeouts); 101 102 if (job == null) { 102 103 currentException = new Exception("Pausing job " + this.JobId + ": Job is null"); … … 119 120 IsStopping = true; 120 121 // wait until job is started. if this does not happen, the Job is null an we give up 121 jobStartedSem.WaitOne( TimeSpan.FromSeconds(15));122 jobStartedSem.WaitOne(Settings.Default.ExecutorSemTimeouts); 122 123 if (job == null) { 123 124 currentException = new Exception("Stopping job " + this.JobId + ": Job is null"); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ExecutorQueue.cs
r6371 r6456 23 23 using System.Collections.Generic; 24 24 using System.Threading; 25 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 25 26 26 27 namespace HeuristicLab.Clients.Hive.SlaveCore { … … 35 36 public ExecutorQueue() { 36 37 queue = new Queue<ExecutorMessage>(); 37 semaphore = new Semaphore(0, 5000);38 semaphore = new Semaphore(0, Settings.Default.QueuesMaxThreads); 38 39 } 39 40 -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/HeartbeatManager.cs
r6371 r6456 23 23 using System.Collections.Generic; 24 24 using System.Threading; 25 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 25 26 using HeuristicLab.Common; 26 27 … … 39 40 40 41 public HeartbeatManager() { 41 Interval = new TimeSpan(0, 0, 10); 42 } 43 44 public HeartbeatManager(TimeSpan interval) { 45 Interval = interval; 42 Interval = new TimeSpan(0, 0, Settings.Default.HeartbeatInterval); 46 43 } 47 44 -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/PluginManager.cs
r6371 r6456 27 27 using System.Runtime.Serialization.Formatters.Binary; 28 28 using System.Threading; 29 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 29 30 using HeuristicLab.Core; 30 31 … … 32 33 public class PluginManager { 33 34 private static object locker = new object(); 34 private const string lastUsedFileName = "lastUsed.dat";35 private string lastUsedFileName = Settings.Default.LastUsedFileName; 35 36 //maximum number of days after which a plugin gets deleted if not used 36 private const int maxAge = 5;37 private int pluginLifetime = Settings.Default.PluginLifetime; 37 38 38 39 private string PluginCacheDir { get; set; } … … 45 46 this.pluginService = pluginService; 46 47 this.log = log; 47 PluginCacheDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginCache");48 PluginTempBaseDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginTemp");48 PluginCacheDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.PluginCacheDir); 49 PluginTempBaseDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.PluginTempBaseDir); 49 50 DoUpdateRun(); 50 51 } … … 84 85 } 85 86 86 if (requestedPlugin.Name == "Configuration") {87 if (requestedPlugin.Name == Settings.Default.ConfigurationName) { 87 88 // configuration plugin consists only of 1 file (usually the "HeuristicLab X.X.exe.config") 88 89 configFileName = Path.Combine(targetDir, Path.GetFileName(filePaths.SingleOrDefault())); … … 92 93 // copy files from PluginInfrastructure (which are not declared in any plugins) 93 94 string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); 94 CopyFile(baseDir, targetDir, "HeuristicLab.PluginInfrastructure-3.3.dll");95 CopyFile(baseDir, targetDir, "ICSharpCode.SharpZipLib.dll");96 CopyFile(baseDir, targetDir, "ICSharpCode.SharpZipLib License.txt");95 CopyFile(baseDir, targetDir, Settings.Default.PluginInfrastructureDll); 96 CopyFile(baseDir, targetDir, Settings.Default.SharpZipLibDll); 97 CopyFile(baseDir, targetDir, Settings.Default.SharpZipLibLicense); 97 98 98 99 // copy slave plugins, otherwise its not possible to register the UnhandledException handler to the appdomain 99 CopyFile(baseDir, targetDir, "HeuristicLab.Clients.Hive.SlaveCore-3.4.dll"); 100 CopyFile(baseDir, targetDir, "HeuristicLab.Clients.Hive-3.4.dll"); 101 //CopyFile(baseDir, targetDir, "HeuristicLab.Services.Hive.Common-3.4.dll"); 102 CopyFile(baseDir, targetDir, "HeuristicLab.Hive-3.4.dll"); 103 CopyFile(baseDir, targetDir, "HeuristicLab.Clients.Common-3.3.dll"); 104 100 CopyFile(baseDir, targetDir, Settings.Default.ClientsHiveSlaveCoreDll); 101 CopyFile(baseDir, targetDir, Settings.Default.ClientsHiveDll); 102 CopyFile(baseDir, targetDir, Settings.Default.HiveDll); 103 CopyFile(baseDir, targetDir, Settings.Default.ClientsCommonDll); 105 104 } 106 105 … … 110 109 di.Refresh(); 111 110 while (di.Exists) { 112 Thread.Sleep( 50);111 Thread.Sleep(Settings.Default.DirOpSleepTime); 113 112 di.Refresh(); 114 113 } … … 121 120 di = Directory.CreateDirectory(targetDir); 122 121 while (!di.Exists) { 123 Thread.Sleep( 50);122 Thread.Sleep(Settings.Default.DirOpSleepTime); 124 123 di.Refresh(); 125 124 } … … 253 252 fs.Close(); 254 253 255 if (luDate.AddDays( maxAge) < DateTime.Now) {254 if (luDate.AddDays(pluginLifetime) < DateTime.Now) { 256 255 Directory.Delete(dir, true); 257 256 changed = true; … … 280 279 try { 281 280 log.LogMessage("Deleting plugins..."); 282 int tries = 5;281 int tries = Settings.Default.PluginDeletionRetries; 283 282 string path = Path.Combine(PluginTempBaseDir, id.ToString()); 284 283 while (tries > 0) { … … 288 287 } 289 288 catch (Exception) { 290 Thread.Sleep( 1000);289 Thread.Sleep(Settings.Default.PluginDeletionTimeout); 291 290 tries--; 292 291 if (tries == 0) throw; -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/MessageQueue.cs
r6371 r6456 23 23 using System.Collections.Generic; 24 24 using System.Threading; 25 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 25 26 26 27 namespace HeuristicLab.Clients.Hive.SlaveCore { … … 55 56 private MessageQueue() { 56 57 queue = new Queue<MessageContainer>(); 57 semaphore = new Semaphore(0, 5000);58 semaphore = new Semaphore(0, Settings.Default.QueuesMaxThreads); 58 59 } 59 60 -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.Designer.cs
r5599 r6456 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319. 14 // Runtime Version:4.0.30319.225 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 26 26 [global::System.Configuration.UserScopedSettingAttribute()] 27 27 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 28 [global::System.Configuration.DefaultSettingValueAttribute("00000000-0000-0000-0000-000000000000")] 29 public global::System.Guid Guid { 30 get { 31 return ((global::System.Guid)(this["Guid"])); 32 } 33 set { 34 this["Guid"] = value; 28 [global::System.Configuration.DefaultSettingValueAttribute("10")] 29 public int HeartbeatInterval { 30 get { 31 return ((int)(this["HeartbeatInterval"])); 32 } 33 set { 34 this["HeartbeatInterval"] = value; 35 } 36 } 37 38 [global::System.Configuration.UserScopedSettingAttribute()] 39 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 40 [global::System.Configuration.DefaultSettingValueAttribute("lastUsed.dat")] 41 public string LastUsedFileName { 42 get { 43 return ((string)(this["LastUsedFileName"])); 44 } 45 set { 46 this["LastUsedFileName"] = value; 47 } 48 } 49 50 [global::System.Configuration.UserScopedSettingAttribute()] 51 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 52 [global::System.Configuration.DefaultSettingValueAttribute("PluginCache")] 53 public string PluginCacheDir { 54 get { 55 return ((string)(this["PluginCacheDir"])); 56 } 57 set { 58 this["PluginCacheDir"] = value; 59 } 60 } 61 62 [global::System.Configuration.UserScopedSettingAttribute()] 63 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 64 [global::System.Configuration.DefaultSettingValueAttribute("PluginTemp")] 65 public string PluginTempBaseDir { 66 get { 67 return ((string)(this["PluginTempBaseDir"])); 68 } 69 set { 70 this["PluginTempBaseDir"] = value; 71 } 72 } 73 74 [global::System.Configuration.UserScopedSettingAttribute()] 75 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 76 [global::System.Configuration.DefaultSettingValueAttribute("Configuration")] 77 public string ConfigurationName { 78 get { 79 return ((string)(this["ConfigurationName"])); 80 } 81 set { 82 this["ConfigurationName"] = value; 83 } 84 } 85 86 [global::System.Configuration.UserScopedSettingAttribute()] 87 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 88 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.PluginInfrastructure-3.3.dll")] 89 public string PluginInfrastructureDll { 90 get { 91 return ((string)(this["PluginInfrastructureDll"])); 92 } 93 set { 94 this["PluginInfrastructureDll"] = value; 95 } 96 } 97 98 [global::System.Configuration.UserScopedSettingAttribute()] 99 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 100 [global::System.Configuration.DefaultSettingValueAttribute("ICSharpCode.SharpZipLib.dll")] 101 public string SharpZipLibDll { 102 get { 103 return ((string)(this["SharpZipLibDll"])); 104 } 105 set { 106 this["SharpZipLibDll"] = value; 107 } 108 } 109 110 [global::System.Configuration.UserScopedSettingAttribute()] 111 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 112 [global::System.Configuration.DefaultSettingValueAttribute("ICSharpCode.SharpZipLib License.txt")] 113 public string SharpZipLibLicense { 114 get { 115 return ((string)(this["SharpZipLibLicense"])); 116 } 117 set { 118 this["SharpZipLibLicense"] = value; 119 } 120 } 121 122 [global::System.Configuration.UserScopedSettingAttribute()] 123 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 124 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore-3.4.dll")] 125 public string ClientsHiveSlaveCoreDll { 126 get { 127 return ((string)(this["ClientsHiveSlaveCoreDll"])); 128 } 129 set { 130 this["ClientsHiveSlaveCoreDll"] = value; 131 } 132 } 133 134 [global::System.Configuration.UserScopedSettingAttribute()] 135 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 136 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive-3.4.dll")] 137 public string ClientsHiveDll { 138 get { 139 return ((string)(this["ClientsHiveDll"])); 140 } 141 set { 142 this["ClientsHiveDll"] = value; 143 } 144 } 145 146 [global::System.Configuration.UserScopedSettingAttribute()] 147 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 148 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Hive-3.4.dll")] 149 public string HiveDll { 150 get { 151 return ((string)(this["HiveDll"])); 152 } 153 set { 154 this["HiveDll"] = value; 155 } 156 } 157 158 [global::System.Configuration.UserScopedSettingAttribute()] 159 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 160 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Common-3.3.dll")] 161 public string ClientsCommonDll { 162 get { 163 return ((string)(this["ClientsCommonDll"])); 164 } 165 set { 166 this["ClientsCommonDll"] = value; 167 } 168 } 169 170 [global::System.Configuration.UserScopedSettingAttribute()] 171 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 172 [global::System.Configuration.DefaultSettingValueAttribute("3")] 173 public int PluginLifetime { 174 get { 175 return ((int)(this["PluginLifetime"])); 176 } 177 set { 178 this["PluginLifetime"] = value; 179 } 180 } 181 182 [global::System.Configuration.UserScopedSettingAttribute()] 183 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 184 [global::System.Configuration.DefaultSettingValueAttribute("50")] 185 public int DirOpSleepTime { 186 get { 187 return ((int)(this["DirOpSleepTime"])); 188 } 189 set { 190 this["DirOpSleepTime"] = value; 191 } 192 } 193 194 [global::System.Configuration.UserScopedSettingAttribute()] 195 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 196 [global::System.Configuration.DefaultSettingValueAttribute("5")] 197 public int PluginDeletionRetries { 198 get { 199 return ((int)(this["PluginDeletionRetries"])); 200 } 201 set { 202 this["PluginDeletionRetries"] = value; 203 } 204 } 205 206 [global::System.Configuration.UserScopedSettingAttribute()] 207 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 208 [global::System.Configuration.DefaultSettingValueAttribute("1000")] 209 public int PluginDeletionTimeout { 210 get { 211 return ((int)(this["PluginDeletionTimeout"])); 212 } 213 set { 214 this["PluginDeletionTimeout"] = value; 215 } 216 } 217 218 [global::System.Configuration.UserScopedSettingAttribute()] 219 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 220 [global::System.Configuration.DefaultSettingValueAttribute("45")] 221 public int ExecutorSemTimeouts { 222 get { 223 return ((int)(this["ExecutorSemTimeouts"])); 224 } 225 set { 226 this["ExecutorSemTimeouts"] = value; 227 } 228 } 229 230 [global::System.Configuration.UserScopedSettingAttribute()] 231 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 232 [global::System.Configuration.DefaultSettingValueAttribute("5000")] 233 public int QueuesMaxThreads { 234 get { 235 return ((int)(this["QueuesMaxThreads"])); 236 } 237 set { 238 this["QueuesMaxThreads"] = value; 239 } 240 } 241 242 [global::System.Configuration.UserScopedSettingAttribute()] 243 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 244 [global::System.Configuration.DefaultSettingValueAttribute("SlaveCommunicationServiceEndpoint")] 245 public string SlaveCommunicationServiceEndpoint { 246 get { 247 return ((string)(this["SlaveCommunicationServiceEndpoint"])); 248 } 249 set { 250 this["SlaveCommunicationServiceEndpoint"] = value; 251 } 252 } 253 254 [global::System.Configuration.UserScopedSettingAttribute()] 255 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 256 [global::System.Configuration.DefaultSettingValueAttribute("hiveslave")] 257 public string SlaveUser { 258 get { 259 return ((string)(this["SlaveUser"])); 260 } 261 set { 262 this["SlaveUser"] = value; 263 } 264 } 265 266 [global::System.Configuration.UserScopedSettingAttribute()] 267 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 268 [global::System.Configuration.DefaultSettingValueAttribute("hiveslave")] 269 public string SlavePwd { 270 get { 271 return ((string)(this["SlavePwd"])); 272 } 273 set { 274 this["SlavePwd"] = value; 35 275 } 36 276 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.settings
r5105 r6456 1 1 <?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 .Properties" GeneratedClassName="Settings">2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Clients.Hive.SlaveCore.Properties" GeneratedClassName="Settings"> 3 3 <Profiles /> 4 4 <Settings> 5 <Setting Name="Guid" Type="System.Guid" Scope="User"> 6 <Value Profile="(Default)">00000000-0000-0000-0000-000000000000</Value> 5 <Setting Name="HeartbeatInterval" Type="System.Int32" Scope="User"> 6 <Value Profile="(Default)">10</Value> 7 </Setting> 8 <Setting Name="LastUsedFileName" Type="System.String" Scope="User"> 9 <Value Profile="(Default)">lastUsed.dat</Value> 10 </Setting> 11 <Setting Name="PluginCacheDir" Type="System.String" Scope="User"> 12 <Value Profile="(Default)">PluginCache</Value> 13 </Setting> 14 <Setting Name="PluginTempBaseDir" Type="System.String" Scope="User"> 15 <Value Profile="(Default)">PluginTemp</Value> 16 </Setting> 17 <Setting Name="ConfigurationName" Type="System.String" Scope="User"> 18 <Value Profile="(Default)">Configuration</Value> 19 </Setting> 20 <Setting Name="PluginInfrastructureDll" Type="System.String" Scope="User"> 21 <Value Profile="(Default)">HeuristicLab.PluginInfrastructure-3.3.dll</Value> 22 </Setting> 23 <Setting Name="SharpZipLibDll" Type="System.String" Scope="User"> 24 <Value Profile="(Default)">ICSharpCode.SharpZipLib.dll</Value> 25 </Setting> 26 <Setting Name="SharpZipLibLicense" Type="System.String" Scope="User"> 27 <Value Profile="(Default)">ICSharpCode.SharpZipLib License.txt</Value> 28 </Setting> 29 <Setting Name="ClientsHiveSlaveCoreDll" Type="System.String" Scope="User"> 30 <Value Profile="(Default)">HeuristicLab.Clients.Hive.SlaveCore-3.4.dll</Value> 31 </Setting> 32 <Setting Name="ClientsHiveDll" Type="System.String" Scope="User"> 33 <Value Profile="(Default)">HeuristicLab.Clients.Hive-3.4.dll</Value> 34 </Setting> 35 <Setting Name="HiveDll" Type="System.String" Scope="User"> 36 <Value Profile="(Default)">HeuristicLab.Hive-3.4.dll</Value> 37 </Setting> 38 <Setting Name="ClientsCommonDll" Type="System.String" Scope="User"> 39 <Value Profile="(Default)">HeuristicLab.Clients.Common-3.3.dll</Value> 40 </Setting> 41 <Setting Name="PluginLifetime" Type="System.Int32" Scope="User"> 42 <Value Profile="(Default)">3</Value> 43 </Setting> 44 <Setting Name="DirOpSleepTime" Type="System.Int32" Scope="User"> 45 <Value Profile="(Default)">50</Value> 46 </Setting> 47 <Setting Name="PluginDeletionRetries" Type="System.Int32" Scope="User"> 48 <Value Profile="(Default)">5</Value> 49 </Setting> 50 <Setting Name="PluginDeletionTimeout" Type="System.Int32" Scope="User"> 51 <Value Profile="(Default)">1000</Value> 52 </Setting> 53 <Setting Name="ExecutorSemTimeouts" Type="System.Int32" Scope="User"> 54 <Value Profile="(Default)">45</Value> 55 </Setting> 56 <Setting Name="QueuesMaxThreads" Type="System.Int32" Scope="User"> 57 <Value Profile="(Default)">5000</Value> 58 </Setting> 59 <Setting Name="SlaveCommunicationServiceEndpoint" Type="System.String" Scope="User"> 60 <Value Profile="(Default)">SlaveCommunicationServiceEndpoint</Value> 61 </Setting> 62 <Setting Name="SlaveUser" Type="System.String" Scope="User"> 63 <Value Profile="(Default)">hiveslave</Value> 64 </Setting> 65 <Setting Name="SlavePwd" Type="System.String" Scope="User"> 66 <Value Profile="(Default)">hiveslave</Value> 7 67 </Setting> 8 68 </Settings> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveClientCom.cs
r6371 r6456 21 21 22 22 using System.ServiceModel; 23 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 23 24 using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts; 24 25 … … 53 54 DummyListener dummy = new DummyListener(); 54 55 try { 55 pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, "SlaveCommunicationServiceEndpoint");56 pipeFactory = new DuplexChannelFactory<ISlaveCommunication>(dummy, Settings.Default.SlaveCommunicationServiceEndpoint); 56 57 } 57 58 catch { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs
r6371 r6456 23 23 using System.IO; 24 24 using System.Threading; 25 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; … … 126 127 if (appDomain != null) { 127 128 appDomain.UnhandledException -= new UnhandledExceptionEventHandler(AppDomain_UnhandledException); 128 int repeat = 5;129 int repeat = Settings.Default.PluginDeletionRetries; 129 130 while (repeat > 0) { 130 131 try { … … 136 137 catch (CannotUnloadAppDomainException) { 137 138 log.LogMessage("Could not unload AppDomain, will try again in 1 sec."); 138 Thread.Sleep( 1000);139 Thread.Sleep(Settings.Default.PluginDeletionTimeout); 139 140 repeat--; 140 141 if (repeat == 0) { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs
r6452 r6456 22 22 using System; 23 23 using System.Collections.Generic; 24 using HeuristicLab.Clients.Hive.SlaveCore.Properties; 24 25 using HeuristicLab.Common; 25 26 … … 42 43 if (instance == null) { 43 44 instance = new WcfService(); 44 ServiceLocator.Instance.Username = "hiveslave";45 ServiceLocator.Instance.Password = "hiveslave";45 ServiceLocator.Instance.Username = Settings.Default.SlaveUser; 46 ServiceLocator.Instance.Password = Settings.Default.SlavePwd; 46 47 } 47 48 return instance; … … 77 78 HiveClient.TryAndRepeat(() => { 78 79 service.UpdateJobData(job, jobData); 79 }, 3, "Could not upload jobdata.");80 }, Settings.Default.PluginDeletionRetries, "Could not upload jobdata."); 80 81 service.UpdateJobState(job.Id, state, slaveId, null, exception); 81 82 }); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config
r6269 r6456 6 6 7 7 <configSections> 8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">9 <section name="HeuristicLab.Clients.Hive.Slave .Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > 9 <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" /> 10 10 </sectionGroup> 11 11 </configSections> 12 12 <userSettings> 13 <HeuristicLab.Clients.Hive.Slave .Properties.Settings>14 <setting name=" Guid" serializeAs="String">15 <value> 00000000-0000-0000-0000-000000000000</value>13 <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> 14 <setting name="HeartbeatInterval" serializeAs="String"> 15 <value>10</value> 16 16 </setting> 17 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 17 <setting name="LastUsedFileName" serializeAs="String"> 18 <value>lastUsed.dat</value> 19 </setting> 20 <setting name="PluginCacheDir" serializeAs="String"> 21 <value>PluginCache</value> 22 </setting> 23 <setting name="PluginTempBaseDir" serializeAs="String"> 24 <value>PluginTemp</value> 25 </setting> 26 <setting name="ConfigurationName" serializeAs="String"> 27 <value>Configuration</value> 28 </setting> 29 <setting name="PluginInfrastructureDll" serializeAs="String"> 30 <value>HeuristicLab.PluginInfrastructure-3.3.dll</value> 31 </setting> 32 <setting name="SharpZipLibDll" serializeAs="String"> 33 <value>ICSharpCode.SharpZipLib.dll</value> 34 </setting> 35 <setting name="SharpZipLibLicense" serializeAs="String"> 36 <value>ICSharpCode.SharpZipLib License.txt</value> 37 </setting> 38 <setting name="ClientsHiveSlaveCoreDll" serializeAs="String"> 39 <value>HeuristicLab.Clients.Hive.SlaveCore-3.4.dll</value> 40 </setting> 41 <setting name="ClientsHiveDll" serializeAs="String"> 42 <value>HeuristicLab.Clients.Hive-3.4.dll</value> 43 </setting> 44 <setting name="HiveDll" serializeAs="String"> 45 <value>HeuristicLab.Hive-3.4.dll</value> 46 </setting> 47 <setting name="ClientsCommonDll" serializeAs="String"> 48 <value>HeuristicLab.Clients.Common-3.3.dll</value> 49 </setting> 50 <setting name="PluginLifetime" serializeAs="String"> 51 <value>3</value> 52 </setting> 53 <setting name="DirOpSleepTime" serializeAs="String"> 54 <value>50</value> 55 </setting> 56 <setting name="PluginDeletionRetries" serializeAs="String"> 57 <value>5</value> 58 </setting> 59 <setting name="PluginDeletionTimeout" serializeAs="String"> 60 <value>1000</value> 61 </setting> 62 <setting name="ExecutorSemTimeouts" serializeAs="String"> 63 <value>45</value> 64 </setting> 65 <setting name="QueuesMaxThreads" serializeAs="String"> 66 <value>5000</value> 67 </setting> 68 <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String"> 69 <value>SlaveCommunicationServiceEndpoint</value> 70 </setting> 71 <setting name="SlaveUser" serializeAs="String"> 72 <value>hiveslave</value> 73 </setting> 74 <setting name="SlavePwd" serializeAs="String"> 75 <value>hiveslave</value> 76 </setting> 77 </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> 18 78 </userSettings> 79 19 80 20 81 <system.serviceModel> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config
r6269 r6456 6 6 7 7 <configSections> 8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">9 <section name="HeuristicLab.Clients.Hive.Slave .Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > 9 <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" /> 10 10 </sectionGroup> 11 11 </configSections> 12 12 <userSettings> 13 <HeuristicLab.Clients.Hive.Slave .Properties.Settings>14 <setting name=" Guid" serializeAs="String">15 <value> 00000000-0000-0000-0000-000000000000</value>13 <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> 14 <setting name="HeartbeatInterval" serializeAs="String"> 15 <value>10</value> 16 16 </setting> 17 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 17 <setting name="LastUsedFileName" serializeAs="String"> 18 <value>lastUsed.dat</value> 19 </setting> 20 <setting name="PluginCacheDir" serializeAs="String"> 21 <value>PluginCache</value> 22 </setting> 23 <setting name="PluginTempBaseDir" serializeAs="String"> 24 <value>PluginTemp</value> 25 </setting> 26 <setting name="ConfigurationName" serializeAs="String"> 27 <value>Configuration</value> 28 </setting> 29 <setting name="PluginInfrastructureDll" serializeAs="String"> 30 <value>HeuristicLab.PluginInfrastructure-3.3.dll</value> 31 </setting> 32 <setting name="SharpZipLibDll" serializeAs="String"> 33 <value>ICSharpCode.SharpZipLib.dll</value> 34 </setting> 35 <setting name="SharpZipLibLicense" serializeAs="String"> 36 <value>ICSharpCode.SharpZipLib License.txt</value> 37 </setting> 38 <setting name="ClientsHiveSlaveCoreDll" serializeAs="String"> 39 <value>HeuristicLab.Clients.Hive.SlaveCore-3.4.dll</value> 40 </setting> 41 <setting name="ClientsHiveDll" serializeAs="String"> 42 <value>HeuristicLab.Clients.Hive-3.4.dll</value> 43 </setting> 44 <setting name="HiveDll" serializeAs="String"> 45 <value>HeuristicLab.Hive-3.4.dll</value> 46 </setting> 47 <setting name="ClientsCommonDll" serializeAs="String"> 48 <value>HeuristicLab.Clients.Common-3.3.dll</value> 49 </setting> 50 <setting name="PluginLifetime" serializeAs="String"> 51 <value>3</value> 52 </setting> 53 <setting name="DirOpSleepTime" serializeAs="String"> 54 <value>50</value> 55 </setting> 56 <setting name="PluginDeletionRetries" serializeAs="String"> 57 <value>5</value> 58 </setting> 59 <setting name="PluginDeletionTimeout" serializeAs="String"> 60 <value>1000</value> 61 </setting> 62 <setting name="ExecutorSemTimeouts" serializeAs="String"> 63 <value>45</value> 64 </setting> 65 <setting name="QueuesMaxThreads" serializeAs="String"> 66 <value>5000</value> 67 </setting> 68 <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String"> 69 <value>SlaveCommunicationServiceEndpoint</value> 70 </setting> 71 <setting name="SlaveUser" serializeAs="String"> 72 <value>hiveslave</value> 73 </setting> 74 <setting name="SlavePwd" serializeAs="String"> 75 <value>hiveslave</value> 76 </setting> 77 </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> 18 78 </userSettings> 79 19 80 20 81 <system.serviceModel> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_services.config
r6269 r6456 6 6 7 7 <configSections> 8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">9 <section name="HeuristicLab.Clients.Hive.Slave .Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>8 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > 9 <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" /> 10 10 </sectionGroup> 11 11 </configSections> 12 12 <userSettings> 13 <HeuristicLab.Clients.Hive.Slave .Properties.Settings>14 <setting name=" Guid" serializeAs="String">15 <value> 00000000-0000-0000-0000-000000000000</value>13 <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> 14 <setting name="HeartbeatInterval" serializeAs="String"> 15 <value>10</value> 16 16 </setting> 17 </HeuristicLab.Clients.Hive.Slave.Properties.Settings> 17 <setting name="LastUsedFileName" serializeAs="String"> 18 <value>lastUsed.dat</value> 19 </setting> 20 <setting name="PluginCacheDir" serializeAs="String"> 21 <value>PluginCache</value> 22 </setting> 23 <setting name="PluginTempBaseDir" serializeAs="String"> 24 <value>PluginTemp</value> 25 </setting> 26 <setting name="ConfigurationName" serializeAs="String"> 27 <value>Configuration</value> 28 </setting> 29 <setting name="PluginInfrastructureDll" serializeAs="String"> 30 <value>HeuristicLab.PluginInfrastructure-3.3.dll</value> 31 </setting> 32 <setting name="SharpZipLibDll" serializeAs="String"> 33 <value>ICSharpCode.SharpZipLib.dll</value> 34 </setting> 35 <setting name="SharpZipLibLicense" serializeAs="String"> 36 <value>ICSharpCode.SharpZipLib License.txt</value> 37 </setting> 38 <setting name="ClientsHiveSlaveCoreDll" serializeAs="String"> 39 <value>HeuristicLab.Clients.Hive.SlaveCore-3.4.dll</value> 40 </setting> 41 <setting name="ClientsHiveDll" serializeAs="String"> 42 <value>HeuristicLab.Clients.Hive-3.4.dll</value> 43 </setting> 44 <setting name="HiveDll" serializeAs="String"> 45 <value>HeuristicLab.Hive-3.4.dll</value> 46 </setting> 47 <setting name="ClientsCommonDll" serializeAs="String"> 48 <value>HeuristicLab.Clients.Common-3.3.dll</value> 49 </setting> 50 <setting name="PluginLifetime" serializeAs="String"> 51 <value>3</value> 52 </setting> 53 <setting name="DirOpSleepTime" serializeAs="String"> 54 <value>50</value> 55 </setting> 56 <setting name="PluginDeletionRetries" serializeAs="String"> 57 <value>5</value> 58 </setting> 59 <setting name="PluginDeletionTimeout" serializeAs="String"> 60 <value>1000</value> 61 </setting> 62 <setting name="ExecutorSemTimeouts" serializeAs="String"> 63 <value>45</value> 64 </setting> 65 <setting name="QueuesMaxThreads" serializeAs="String"> 66 <value>5000</value> 67 </setting> 68 <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String"> 69 <value>SlaveCommunicationServiceEndpoint</value> 70 </setting> 71 <setting name="SlaveUser" serializeAs="String"> 72 <value>hiveslave</value> 73 </setting> 74 <setting name="SlavePwd" serializeAs="String"> 75 <value>hiveslave</value> 76 </setting> 77 </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> 18 78 </userSettings> 79 19 80 20 81 <system.serviceModel>
Note: See TracChangeset
for help on using the changeset viewer.