Changeset 9636 for branches/HivePerformance

Timestamp:

06/17/13 13:47:00 (12 years ago)

Author:

pfleck

Message:

#2030:
Added changes as suggested from server review by ascheibe.

Location:

branches/HivePerformance/sources

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (3 diffs)

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs

@@ -21 +21 @@
 
 using System;
-using System.IO;
 using System.Transactions;
 
@@ -38 +37 @@
           n--; // probably deadlock situation, let it roll back and repeat the transaction n times
           LogFactory.GetLogger(typeof(TransactionManager).Namespace).Log(string.Format("Exception occured, repeating transaction {0} more times. Details: {1}", n, e.ToString()));
-          var log = new StreamWriter(@"C:\Temp\AbortedTransactions.log", true);
-          log.WriteLine(DateTime.Now + ": Transaction aborted: " + n + " (" + e.Message + ")");
-          log.WriteLine(e.StackTrace);
-          log.Close();
           if (n <= 0) throw;
         }

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -222 +222 @@
         }
 
-        //optimizedDao.UpdateTaskAndPlugins(task); no idea why this is needed
         return DT.Convert.ToDto(task);
       });
@@ -394 +393 @@
 
         if (slave == null) {
-          var healGroup = dao.GetResources(x => x.Name == "HEAL").FirstOrDefault();
-          if (healGroup != null) {
-            slaveInfo.ParentResourceId = healGroup.Id;
-          }
           dao.AddSlave(slaveInfo);
         } else {

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -73 +73 @@
           dao.UpdateSlave(slave);
         });
-      }
 
-      if (slave != null) {
         // update task data
         actions.AddRange(UpdateTasks(heartbeat, slave.IsAllowedToCalculate));
@@ -94 +92 @@
                 if (availableTasks.Any()) {
                   var task = availableTasks.First();
-                  AssignJob(slave, task.TaskId);
+                  AssignTask(slave, task.TaskId);
                   actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, task.TaskId));
                 }
@@ -114 +112 @@
     }
 
-    private void AssignJob(Slave slave, Guid taskId) {
-      var task = dao.UpdateTaskState(taskId, DataAccess.TaskState.Transferring, slave.ResourceId, null, null);
+    private void AssignTask(Slave slave, Guid taskId) {
+      var task = dao.UpdateTaskState(taskId, TaskState.Transferring, slave.ResourceId, null, null);
 
       // from now on the task has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)