Changeset 8266 for branches/OaaS
- Timestamp:
- 07/09/12 17:06:08 (12 years ago)
- Location:
- branches/OaaS
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj
r6983 r8266 115 115 <Compile Include="Properties\AssemblyInfo.cs" /> 116 116 <None Include="Properties\AssemblyInfo.cs.frame" /> 117 <Compile Include="Settings.cs" /> 117 118 <Compile Include="Settings.Designer.cs"> 118 119 <AutoGen>True</AutoGen> -
branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs
r6983 r8266 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319.2 354 // Runtime Version:4.0.30319.269 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 27 27 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 28 28 [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] 29 [global::System.Configuration.DefaultSettingValueAttribute("Data Source= localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=T" +30 " rue;")]29 [global::System.Configuration.DefaultSettingValueAttribute("Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3" + 30 ";User ID=cloudia;Password=d1fFntitafvX;Enlist=False")] 31 31 public string HeuristicLab_Hive_LinqConnectionString { 32 32 get { -
branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings
r6983 r8266 6 6 <DesignTimeValue Profile="(Default)"><?xml version="1.0" encoding="utf-16"?> 7 7 <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 8 <ConnectionString>Data Source= localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</ConnectionString>8 <ConnectionString>Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3;User ID=cloudia;Password=d1fFntitafvX;Enlist=False</ConnectionString> 9 9 <ProviderName>System.Data.SqlClient</ProviderName> 10 10 </SerializableConnectionString></DesignTimeValue> 11 <Value Profile="(Default)">Data Source= localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</Value>11 <Value Profile="(Default)">Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3;User ID=cloudia;Password=d1fFntitafvX;Enlist=False</Value> 12 12 </Setting> 13 13 <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application"> -
branches/OaaS/HeuristicLab.Services.Hive.WebRole/Status.aspx.cs
r8235 r8266 29 29 transactionManager.UseTransaction(() => { 30 30 onlineSlaves = dao.GetSlaves(x => (x.SlaveState == DA.SlaveState.Calculating || x.SlaveState == DA.SlaveState.Idle) && resourceIds.Contains(x.ResourceId)); 31 }, false, false); 32 transactionManager.UseTransaction(() => { 31 33 currentlyJobsWaiting = dao.GetTasks(x => x.State == DA.TaskState.Waiting).Count(); 32 34 }, false, false); -
branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs
r7259 r8266 56 56 LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup"); 57 57 bool cleanup = false; 58 DateTime lastCleanup = DateTime.MinValue; 58 59 trans.UseTransaction(() => { 59 DateTime lastCleanup = dao.GetLastCleanup(); 60 if (DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) { 61 dao.SetLastCleanup(DateTime.Now); 62 cleanup = true; 63 } 60 lastCleanup = dao.GetLastCleanup(); 64 61 }, true); 62 if (DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) { 63 trans.UseTransaction(() => { dao.SetLastCleanup(DateTime.Now); }, true); 64 dao.SetLastCleanup(DateTime.Now); 65 cleanup = true; 66 } 65 67 66 68 if (cleanup) { -
branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveService.cs
r8071 r8266 88 88 author.AuthorizeForTask(taskId, Permission.Read); 89 89 90 return trans.UseTransaction(() => { 91 return dao.GetTask(taskId); 92 }, false, false); 90 //return trans.UseTransaction(() => { 91 // return dao.GetTask(taskId); 92 //}, false, false); 93 94 return dao.GetTask(taskId); 95 93 96 } 94 97 … … 288 291 public Guid AddJob(Job jobDto) { 289 292 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 290 return trans.UseTransaction(() => { 291 jobDto.OwnerUserId = userManager.CurrentUserId; 293 Guid id = userManager.CurrentUserId; 294 295 return trans.UseTransaction(() => { 296 jobDto.OwnerUserId = id; 292 297 jobDto.DateCreated = DateTime.Now; 293 298 return dao.AddJob(jobDto); … … 356 361 slaveInfo.OwnerUserId = userManager.CurrentUserId; 357 362 358 trans.UseTransaction(() => {359 var slave = dao.GetSlave(slaveInfo.Id);360 363 Slave slave = null; 364 trans.UseTransaction(() => { slave = dao.GetSlave(slaveInfo.Id); }); 365 trans.UseTransaction(() => { 361 366 if (slave == null) { 362 367 dao.AddSlave(slaveInfo); … … 400 405 authen.AuthenticateForAnyRole(HiveRoles.Slave); 401 406 402 List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat)); 407 //TODO: enable transaction 408 //List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat)); 409 List<MessageContainer> result = heartbeatManager.ProcessHeartbeat(heartbeat); 403 410 404 411 if (HeuristicLab.Services.Hive.Properties.Settings.Default.TriggerEventManagerInHeartbeat) { -
branches/OaaS/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs
r7862 r8266 46 46 47 47 public void Cleanup() { 48 trans.UseTransaction(() => { 49 SetTimeoutSlavesOffline(); 50 SetTimeoutTasksWaiting(); 51 DeleteObsoleteSlaves(); 52 }, true); 48 //TODO: enable transactions 49 //trans.UseTransaction(() => { 50 SetTimeoutSlavesOffline(); 51 SetTimeoutTasksWaiting(); 52 DeleteObsoleteSlaves(); 53 //}, true); 53 54 54 trans.UseTransaction(() => {55 56 57 }, false);55 //trans.UseTransaction(() => { 56 FinishParentTasks(); 57 UpdateStatistics(); 58 //}, false); 58 59 } 59 60
Note: See TracChangeset
for help on using the changeset viewer.