Changeset 8266

Timestamp:

07/09/12 17:06:08 (12 years ago)

Author:

spimming

Message:

#1888:

• disabled some transactions since dtc is not supported in sql azure
• settings in dataaccess updated

Location:

branches/OaaS

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/Settings.cs (added)
• HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings (modified) (1 diff)
• HeuristicLab.Services.Hive.WebRole/Status.aspx.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

@@ -115 +115 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Settings.Designer.cs">
       <AutoGen>True</AutoGen>

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.235
+//     Runtime Version:4.0.30319.269
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -27 +27 @@
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=T" +
-            "rue;")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3" +
+            ";User ID=cloudia;Password=d1fFntitafvX;Enlist=False")]
         public string HeuristicLab_Hive_LinqConnectionString {
             get {

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

@@ -6 +6 @@
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3;User ID=cloudia;Password=d1fFntitafvX;Enlist=False&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</Value>
+      <Value Profile="(Default)">Data Source=pok6rtjc5c.database.windows.net;Initial Catalog=HeuristicLab.Hive-3.3;User ID=cloudia;Password=d1fFntitafvX;Enlist=False</Value>
     </Setting>
     <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application">

branches/OaaS/HeuristicLab.Services.Hive.WebRole/Status.aspx.cs

@@ -29 +29 @@
       transactionManager.UseTransaction(() => {
         onlineSlaves = dao.GetSlaves(x => (x.SlaveState == DA.SlaveState.Calculating || x.SlaveState == DA.SlaveState.Idle) && resourceIds.Contains(x.ResourceId));
+      }, false, false);
+      transactionManager.UseTransaction(() => {
         currentlyJobsWaiting = dao.GetTasks(x => x.State == DA.TaskState.Waiting).Count();
       }, false, false);

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

@@ -56 +56 @@
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup");
           bool cleanup = false;
+          DateTime lastCleanup = DateTime.MinValue;
           trans.UseTransaction(() => {
-            DateTime lastCleanup = dao.GetLastCleanup();
-            if (DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
-              dao.SetLastCleanup(DateTime.Now);
-              cleanup = true;
-            }
+            lastCleanup = dao.GetLastCleanup();
           }, true);
+          if (DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
+            trans.UseTransaction(() => { dao.SetLastCleanup(DateTime.Now); }, true);
+            dao.SetLastCleanup(DateTime.Now);
+            cleanup = true;
+          }
 
           if (cleanup) {

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -88 +88 @@
       author.AuthorizeForTask(taskId, Permission.Read);
 
-      return trans.UseTransaction(() => {
-        return dao.GetTask(taskId);
-      }, false, false);
+      //return trans.UseTransaction(() => {
+      //  return dao.GetTask(taskId);
+      //}, false, false);
+
+      return dao.GetTask(taskId);
+
     }
 
@@ -288 +291 @@
     public Guid AddJob(Job jobDto) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      return trans.UseTransaction(() => {
-        jobDto.OwnerUserId = userManager.CurrentUserId;
+      Guid id = userManager.CurrentUserId;
+
+      return trans.UseTransaction(() => {
+        jobDto.OwnerUserId = id;
         jobDto.DateCreated = DateTime.Now;
         return dao.AddJob(jobDto);
@@ -356 +361 @@
         slaveInfo.OwnerUserId = userManager.CurrentUserId;
 
-      trans.UseTransaction(() => {
-        var slave = dao.GetSlave(slaveInfo.Id);
-
+      Slave slave = null;
+      trans.UseTransaction(() => { slave = dao.GetSlave(slaveInfo.Id); });
+      trans.UseTransaction(() => {
         if (slave == null) {
           dao.AddSlave(slaveInfo);
@@ -400 +405 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
 
-      List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
+      //TODO: enable transaction
+      //List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
+      List<MessageContainer> result = heartbeatManager.ProcessHeartbeat(heartbeat);
 
       if (HeuristicLab.Services.Hive.Properties.Settings.Default.TriggerEventManagerInHeartbeat) {

branches/OaaS/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -46 +46 @@
 
     public void Cleanup() {
-      trans.UseTransaction(() => {
-        SetTimeoutSlavesOffline();
-        SetTimeoutTasksWaiting();
-        DeleteObsoleteSlaves();
-      }, true);
+      //TODO: enable transactions
+      //trans.UseTransaction(() => {
+      SetTimeoutSlavesOffline();
+      SetTimeoutTasksWaiting();
+      DeleteObsoleteSlaves();
+      //}, true);
 
-      trans.UseTransaction(() => {
-        FinishParentTasks();
-        UpdateStatistics();
-      }, false);
+      //trans.UseTransaction(() => {
+      FinishParentTasks();
+      UpdateStatistics();
+      //}, false);
     }