Changeset 12773 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/NewHeartbeatManager.cs

Timestamp:

07/17/15 10:11:56 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.WebApp-3.3:

• The font is now loaded properly even when accessing the page over https
• Added no-cache to the index page
• Added no-cache to the views in addition to the existing (datetime) cache buster
  • Caching can be enabled when required

HeuristicLab.Services.Hive-3.3:

• Improved performance of NewHeartbeatManager by adding an additional check if the collection is empty

HeuristicLab.Services.WebApp.Statistics-3.3:

• Removed invalid link from the exception page

Projects:

• Added the '-3.3' affix to the assembly names

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/NewHeartbeatManager.cs (modified) (5 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/NewHeartbeatManager.cs

@@ -50 +50 @@
         var slaveDao = pm.SlaveDao;
         var taskDao = pm.TaskDao;
-
         var slave = pm.UseTransaction(() => slaveDao.GetById(heartbeat.SlaveId));
         if (slave == null) {
@@ -85 +84 @@
               if (mutexAquired) {
                 var waitingTasks = pm.UseTransaction(() => taskDao.GetWaitingTasks(slave)
-                  .Select(x => new TaskInfoForScheduler {
-                    TaskId = x.TaskId,
-                    JobId = x.JobId,
-                    Priority = x.Priority
-                  })
-                  .ToList()
+                    .Select(x => new TaskInfoForScheduler {
+                      TaskId = x.TaskId,
+                      JobId = x.JobId,
+                      Priority = x.Priority
+                    })
+                    .ToList()
                 );
                 var availableTasks = TaskScheduler.Schedule(waitingTasks);
@@ -146 +145 @@
       var assignedResourceDao = pm.AssignedResourceDao;
       var actions = new List<MessageContainer>();
-      if (heartbeat.JobProgress == null)
+      if (heartbeat.JobProgress == null || !heartbeat.JobProgress.Any())
         return actions;
 
@@ -154 +153 @@
         // select all tasks and statelogs with one query
         var taskIds = heartbeat.JobProgress.Select(x => x.Key).ToList();
-        var taskInfos =
+        var taskInfos = pm.UseTransaction(() =>
           (from task in taskDao.GetAll()
            where taskIds.Contains(task.TaskId)
@@ -162 +161 @@
              Command = task.Command,
              SlaveId = lastStateLog != null ? lastStateLog.SlaveId : default(Guid)
-           })
-           .ToList();
+           }).ToList()
+        );
 
         // process the jobProgresses