Changeset 9025

Timestamp:

12/11/12 16:27:46 (12 years ago)

Author:

ascheibe

Message:

#1994 added displaying statistics for groups

Location:

trunk/sources

Files:

• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx (modified) (4 diffs)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (2 diffs)

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

@@ -37 +37 @@
     <asp:Label ID="slavesLabel" runat="server" />
       <br />
+      Groups:
+    <asp:Label ID="groupsLabel" runat="server" />
+      <br />
       <br />
       Number of Calculating Tasks by User:<asp:Table ID="calculatingTasksByUserTable" runat="server" GridLines="Both">
@@ -74 +77 @@
     <br />
     Avg. CPU Utilization History of all Slaves<br />
-    <asp:Chart ID="cpuUtilizationChart" runat="server" Height="270px" Width="1900px">
+    <asp:Chart ID="cpuUtilizationChart" runat="server" Height="270px" Width="1280px">
       <Series>
         <asp:Series BorderWidth="2" ChartType="Line" Color="0, 176, 80" Name="Series1" XValueType="DateTime"
@@ -96 +99 @@
     <br />
     Cores/Used Cores History<br />
-    <asp:Chart ID="coresChart" runat="server" Palette="None" Width="1900px" PaletteCustomColors="137, 165, 78; 185, 205, 150">
+    <asp:Chart ID="coresChart" runat="server" Palette="None" Width="1280px" PaletteCustomColors="137, 165, 78; 185, 205, 150">
       <Series>
         <asp:Series ChartType="Area" Name="Cores" XValueType="DateTime" YValueType="Double">
@@ -121 +124 @@
     Memory/Used Memory History (GB)<br />
     <asp:Chart ID="memoryChart" runat="server" Palette="None" PaletteCustomColors="170, 70, 67; 209, 147, 146"
-      Width="1900px">
+      Width="1280px">
       <Series>
         <asp:Series ChartType="Area" Name="Cores" XValueType="DateTime" YValueType="Double">

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

@@ -44 +44 @@
     Dictionary<Guid, int> calculatingTasksByUser = new Dictionary<Guid,int>();
     Dictionary<Guid, int> waitingTasksByUser = new Dictionary<Guid, int>();
+    List<DT.Resource> groups = new List<DT.Resource>();
+
+    transactionManager.UseTransaction(() => {
+       groups = dao.GetResources(x => x.ResourceType == "GROUP").ToList();
+    }, false, false);    
 
     if (!string.IsNullOrEmpty(resourceName)) {
@@ -76 +81 @@
 
     slavesLabel.Text = string.Join(", ", onlineSlaves.Select(x => string.Format("<a href=\"?resource={0}\">{0}</a> ({1} %)", x.Name, Math.Round(x.CpuUtilization, 2))));
+    groupsLabel.Text = string.Join(", ", groups.Select(x => string.Format("<a href=\"?resource={0}\">{0}</a>", x.Name)));
 
     overallCpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 ? Math.Round(onlineSlaves.Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
-    cpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 ? Math.Round(onlineSlaves.Where(x => x.IsAllowedToCalculate).Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
+    cpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 && onlineSlaves.Where(x => x.IsAllowedToCalculate).Count() > 0 ? Math.Round(onlineSlaves.Where(x => x.IsAllowedToCalculate).Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
 
     DT.Statistics[] stats = new DT.Statistics[0];    

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

@@ -639 +639 @@
     public IEnumerable<DT.Resource> GetChildResources(Guid resourceId) {
       using (var db = CreateContext()) {
-        var childs = new List<DT.Resource>();
-        foreach (var child in db.Resources.Where(x => x.ParentResourceId == resourceId)) {
-          childs.Add(DT.Convert.ToDto(child));
-          childs.AddRange(GetChildResources(child.ResourceId));
-        }
-        return childs;
-      }
+        return CollectChildResources(resourceId, db);
+      }
+    }
+
+    public IEnumerable<DT.Resource> CollectChildResources(Guid resourceId, HiveDataContext db) {
+      var childs = new List<DT.Resource>();
+      foreach (var child in db.Resources.Where(x => x.ParentResourceId == resourceId)) {
+        childs.Add(DT.Convert.ToDto(child));
+        childs.AddRange(CollectChildResources(child.ResourceId, db));
+      }
+      return childs;
     }
 
@@ -842 +846 @@
       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() };
+                                     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);
       }