Changeset 9033

Timestamp:

12/12/12 11:04:23 (11 years ago)

Author:

ascheibe

Message:

#1994 Calculating/Waiting Tasks are now calculated for the selected resource

Location:

trunk/sources

Files:

• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx (modified) (1 diff)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs (modified) (5 diffs)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx

@@ -29 +29 @@
     <asp:Label ID="availableCoresLabel" runat="server" />
       <br />
+      <strong>System-Wide Waiting Jobs:</strong>
+    <asp:Label ID="waitingJobsLabel" runat="server" />
+      <br />
       <strong>Used Cores / Calculating Jobs:</strong>
     <asp:Label ID="usedCoresLabel" runat="server" />
-    <br />
-      <strong>Waiting Jobs:</strong>
-    <asp:Label ID="waitingJobsLabel" runat="server" />
     <br />
       <strong>Overall

trunk/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs

@@ -55 +55 @@
             var resId = dao.GetResources(x => x.Name == resourceName).Single().Id;
             resourceIds = dao.GetChildResources(resId).Select(x => x.Id).Union(new List<Guid> { resId });
+            calculatingTasksByUser = dao.GetCalculatingTasksByUserForResources(resourceIds.ToList());
+            waitingTasksByUser = dao.GetWaitingTasksByUserForResources(resourceIds.ToList());
         }, false, false);        
     } else {
@@ -60 +62 @@
         {
              resourceIds = dao.GetResources(x => true).Select(y => y.Id);
+             calculatingTasksByUser = dao.GetCalculatingTasksByUser();
+             waitingTasksByUser = dao.GetWaitingTasksByUser();            
         }, false, false);
     }   
@@ -65 +69 @@
     transactionManager.UseTransaction(() =>
     {                     
-        onlineSlaves = dao.GetSlaves(x => (x.SlaveState == DA.SlaveState.Calculating || x.SlaveState == DA.SlaveState.Idle) && resourceIds.Contains(x.ResourceId));       
-        currentlyJobsWaiting = dao.GetLightweightTasks(x => x.State == DA.TaskState.Waiting).Count();
-        calculatingTasksByUser = dao.GetCalculatingTasksByUser();
-        waitingTasksByUser = dao.GetWaitingTasksByUser();
+        onlineSlaves = dao.GetSlaves(x => (x.SlaveState == DA.SlaveState.Calculating || x.SlaveState == DA.SlaveState.Idle) && resourceIds.Contains(x.ResourceId));
+        currentlyJobsWaiting = dao.GetLightweightTasks(x => x.State == DA.TaskState.Waiting).Count();            
     }, false, false);
 
@@ -116 +118 @@
     }
 
-    foreach (var kvp in waitingTasksByUser) {
+    GenerateTasksByUserTable(waitingTasksByUser, waitingTasksByUserTable);  
+    GenerateTasksByUserTable(calculatingTasksByUser, calculatingTasksByUserTable);  
+  }
+
+  private void GenerateTasksByUserTable(Dictionary<Guid, int> tasksByUser, Table table) {
+    foreach (var kvp in tasksByUser) {
       TableRow curRow = new TableRow();
       TableCell cellUser = new TableCell();
@@ -125 +132 @@
       curRow.Cells.Add(cellUser);
       curRow.Cells.Add(cellCnt);
-      waitingTasksByUserTable.Rows.Add(curRow);
+      table.Rows.Add(curRow);
     }
-
-    foreach (var kvp in calculatingTasksByUser) {
-      TableRow curRow = new TableRow();
-      TableCell cellUser = new TableCell();
-      cellUser.Text = ServiceLocator.Instance.UserManager.GetUserById(kvp.Key).UserName;
-      TableCell cellCnt = new TableCell();
-      cellCnt.Text = kvp.Value.ToString();
-
-      curRow.Cells.Add(cellUser);
-      curRow.Cells.Add(cellCnt);
-      calculatingTasksByUserTable.Rows.Add(curRow);
+    if (tasksByUser.Count() > 0) {
+      TableRow sumRow = new TableRow();        
+      TableCell sumCell = new TableCell();
+      sumCell.BorderWidth = Unit.Pixel(3);
+      sumCell.Text = tasksByUser.Sum(x => x.Value).ToString();
+      sumRow.Cells.Add(new TableCell());
+      sumRow.Cells.Add(sumCell);
+      table.Rows.Add(sumRow);
     }
-  }
+  }  
 }

trunk/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -843 +843 @@
     }
 
+    public Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds) {
+      using (var db = CreateContext()) {
+        var waitingTasksByUser = from task in db.Tasks
+                                 where task.State == TaskState.Waiting && task.AssignedResources.Any(x => resourceIds.Contains(x.ResourceId))
+                                 group task by task.Job.OwnerUserId into g
+                                 select new { UserId = g.Key, UsedCores = g.Count() };
+        return waitingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
     public Dictionary<Guid, int> GetCalculatingTasksByUser() {
       using (var db = CreateContext()) {
         var calculatingTasksByUser = from task in db.Tasks
                                      where task.State == TaskState.Calculating
+                                     group task by task.Job.OwnerUserId into g
+                                     select new { UserId = g.Key, UsedCores = g.Count() };
+        return calculatingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
+    public Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds) {
+      using (var db = CreateContext()) {
+        var calculatingTasksByUser = from task in db.Tasks
+                                     where task.State == TaskState.Calculating && task.AssignedResources.Any(x => resourceIds.Contains(x.ResourceId))
                                      group task by task.Job.OwnerUserId into g
                                      select new { UserId = g.Key, UsedCores = g.Count() };

trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -148 +148 @@
     #region Statistics Methods
     Dictionary<Guid, int> GetWaitingTasksByUser();
+    Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds);
     Dictionary<Guid, int> GetCalculatingTasksByUser();
+    Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds);
     DT.Statistics GetStatistic(Guid id);
     IEnumerable<DT.Statistics> GetStatistics(Expression<Func<Statistics, bool>> predicate);