Changeset 12773 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive

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

Location:

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

Files:

• HeartbeatManager.cs (modified) (1 diff)
• NewHeartbeatManager.cs (modified) (5 diffs)

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

@@ -125 +125 @@
     /// </summary>
     private IEnumerable<MessageContainer> UpdateTasks(Heartbeat heartbeat, bool IsAllowedToCalculate) {
-      List<MessageContainer> actions = new List<MessageContainer>();
+      using (new PerformanceLogger("Old_UpdateTasks")) {
+        List<MessageContainer> actions = new List<MessageContainer>();
 
-      if (heartbeat.JobProgress == null)
-        return actions;
+        if (heartbeat.JobProgress == null)
+          return actions;
 
-      if (!IsAllowedToCalculate && heartbeat.JobProgress.Count != 0) {
-        actions.Add(new MessageContainer(MessageContainer.MessageType.PauseAll));
-      } else {
-        // process the jobProgresses
-        foreach (var jobProgress in heartbeat.JobProgress) {
-          Tuple<Task, Guid?> taskWithLastStateLogSlaveId = null;
-          trans.UseTransaction(() => {
-            taskWithLastStateLogSlaveId = dao.GetTaskByIdAndLastStateLogSlaveId(jobProgress.Key);
-          });
-          var curTask = taskWithLastStateLogSlaveId != null ? taskWithLastStateLogSlaveId.Item1 : null;
-          if (curTask == null) {
-            // task does not exist in db
-            actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, jobProgress.Key));
-            LogFactory.GetLogger(this.GetType().Namespace).Log("Task on slave " + heartbeat.SlaveId + " does not exist in DB: " + jobProgress.Key);
-          } else {
-            var slaveId = taskWithLastStateLogSlaveId.Item2;
-            if (slaveId == Guid.Empty || slaveId != heartbeat.SlaveId) {
-              // assigned slave does not match heartbeat
-              actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.TaskId));
-              LogFactory.GetLogger(this.GetType().Namespace).Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate task: " + curTask);
-            } else if (!dao.TaskIsAllowedToBeCalculatedBySlave(curTask.TaskId, heartbeat.SlaveId)) {
-              // assigned resources ids of task do not match with slaveId (and parent resourceGroupIds); this might happen when slave is moved to different group
-              actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
+        if (!IsAllowedToCalculate && heartbeat.JobProgress.Count != 0) {
+          actions.Add(new MessageContainer(MessageContainer.MessageType.PauseAll));
+        } else {
+          // process the jobProgresses
+          foreach (var jobProgress in heartbeat.JobProgress) {
+            Tuple<Task, Guid?> taskWithLastStateLogSlaveId = null;
+            trans.UseTransaction(() => {
+              taskWithLastStateLogSlaveId =
+                dao.GetTaskByIdAndLastStateLogSlaveId(jobProgress.Key);
+            });
+            var curTask = taskWithLastStateLogSlaveId != null ? taskWithLastStateLogSlaveId.Item1 : null;
+            if (curTask == null) {
+              // task does not exist in db
+              actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, jobProgress.Key));
+              LogFactory.GetLogger(this.GetType().Namespace)
+                .Log("Task on slave " + heartbeat.SlaveId + " does not exist in DB: " + jobProgress.Key);
             } else {
-              // save task execution time
-              curTask.ExecutionTimeMs = jobProgress.Value.TotalMilliseconds;
-              curTask.LastHeartbeat = DateTime.Now;
+              var slaveId = taskWithLastStateLogSlaveId.Item2;
+              if (slaveId == Guid.Empty || slaveId != heartbeat.SlaveId) {
+                // assigned slave does not match heartbeat
+                actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.TaskId));
+                LogFactory.GetLogger(this.GetType().Namespace)
+                  .Log("The slave " + heartbeat.SlaveId + " is not supposed to calculate task: " + curTask);
+              } else if (!dao.TaskIsAllowedToBeCalculatedBySlave(curTask.TaskId, heartbeat.SlaveId)) {
+                // assigned resources ids of task do not match with slaveId (and parent resourceGroupIds); this might happen when slave is moved to different group
+                actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
+              } else {
+                // save task execution time
+                curTask.ExecutionTimeMs = jobProgress.Value.TotalMilliseconds;
+                curTask.LastHeartbeat = DateTime.Now;
 
-              switch (curTask.Command) {
-                case Command.Stop:
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.StopTask, curTask.TaskId));
-                  break;
-                case Command.Pause:
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
-                  break;
-                case Command.Abort:
-                  actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.TaskId));
-                  break;
+                switch (curTask.Command) {
+                  case Command.Stop:
+                    actions.Add(new MessageContainer(MessageContainer.MessageType.StopTask, curTask.TaskId));
+                    break;
+                  case Command.Pause:
+                    actions.Add(new MessageContainer(MessageContainer.MessageType.PauseTask, curTask.TaskId));
+                    break;
+                  case Command.Abort:
+                    actions.Add(new MessageContainer(MessageContainer.MessageType.AbortTask, curTask.TaskId));
+                    break;
+                }
+                trans.UseTransaction(() => {
+                  dao.UpdateTask(curTask);
+                });
               }
-              trans.UseTransaction(() => {
-                dao.UpdateTask(curTask);
-              });
             }
           }
         }
+        return actions;
       }
-      return actions;
     }
   }

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