Changeset 12525 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

Timestamp:

06/26/15 18:02:03 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.WebApp.Statistics-3.3:

• added groups page
• improved jobs, clients and users pages

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

@@ -86 +86 @@
                     State = clientInfo.SlaveState.ToString(),
                     LastUpdate = clientInfo.Time,
+                    GroupId = client.ResourceGroupId,
+                    GroupName = client.GroupName,
                     UpTime = offline ? 0 : upTime,
                     TotalUnavailableTime = timeData != null ? timeData.TotalUnavailableTime : 0,
@@ -124 +126 @@
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
                          State = clientInfo.SlaveState.ToString(),
+                         GroupId = client.ResourceGroupId,
+                         GroupName = client.GroupName
                        });
           return new DT.ClientPage {
@@ -186 +190 @@
     }
 
+    public DT.ClientPage GetClientsByGroupId(Guid id, int page, int size, bool expired = false) {
+      using (var pm = PersistenceManager) {
+        var dimClientDao = pm.DimClientDao;
+        var factClientInfoDao = pm.FactClientInfoDao;
+        return pm.UseTransaction(() => {
+          var clients = expired ? dimClientDao.GetExpiredClients() : dimClientDao.GetActiveClients();
+          clients = clients.Where(x => x.ResourceGroupId == id);
+          var query = (from client in clients
+                       join info in factClientInfoDao.GetAll()
+                         on client.Id equals info.ClientId into clientInfoJoin
+                       from clientInfo in clientInfoJoin.OrderByDescending(x => x.Time).Take(1)
+                       let offline = (expired || clientInfo.SlaveState == SlaveState.Offline)
+                       select new DT.Client {
+                         Id = client.Id,
+                         Name = client.Name,
+                         TotalCores = clientInfo.NumTotalCores,
+                         UsedCores = offline ? 0 : clientInfo.NumUsedCores,
+                         TotalMemory = clientInfo.TotalMemory,
+                         UsedMemory = offline ? 0 : clientInfo.UsedMemory,
+                         CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
+                         State = clientInfo.SlaveState.ToString(),
+                         GroupId = client.ResourceGroupId,
+                         GroupName = client.GroupName
+                       });
+          return new DT.ClientPage {
+            TotalClients = query.Count(),
+            Clients = query.Skip((page - 1) * size)
+              .Take(size)
+              .ToList()
+          };
+        });
+      }
+    }
+
+    public IEnumerable<DT.ClientStatus> GetClientHistoryByGroupId(Guid id, DateTime start, DateTime end) {
+      TimeSpan ts = end - start;
+      int increment = 1;
+      double totalMinutes = ts.TotalMinutes;
+      while (totalMinutes > 5761) {
+        totalMinutes -= 5761;
+        increment += 5;
+      }
+      using (var pm = PersistenceManager) {
+        var factClientInfo = pm.FactClientInfoDao;
+        var dimClientDao = pm.DimClientDao;
+        var clientInfos = factClientInfo.GetAll()
+          .Where(x => x.Time >= start && x.Time <= end)
+          .OrderBy(x => x.Time)
+          .Join(dimClientDao.GetAll(),
+            fact => fact.ClientId,
+            client => client.Id,
+            (fact, client) => new {
+              client.ResourceGroupId,
+              fact.Time,
+              fact.CpuUtilization,
+              fact.NumTotalCores,
+              fact.NumUsedCores,
+              fact.TotalMemory,
+              fact.UsedMemory
+            })
+          .Where(x => x.ResourceGroupId == id)
+          .ToList();
+        var clientStatus = new DT.ClientStatus {
+          CpuUtilization = 0,
+          TotalCores = 0,
+          UsedCores = 0,
+          TotalMemory = 0,
+          UsedMemory = 0
+        };
+        int i = 1;
+        foreach (var clientInfo in clientInfos) {
+          clientStatus.CpuUtilization += clientInfo.CpuUtilization;
+          clientStatus.TotalCores += clientInfo.NumTotalCores;
+          clientStatus.UsedCores += clientInfo.NumUsedCores;
+          clientStatus.TotalMemory += clientInfo.TotalMemory;
+          clientStatus.UsedMemory += clientInfo.UsedMemory;
+          if (i >= increment) {
+            clientStatus.Timestamp = JavascriptUtils.ToTimestamp(clientInfo.Time);
+            clientStatus.CpuUtilization /= i;
+            clientStatus.TotalCores /= i;
+            clientStatus.UsedCores /= i;
+            clientStatus.TotalMemory /= i;
+            clientStatus.UsedMemory /= i;
+            yield return clientStatus;
+            clientStatus = new DT.ClientStatus {
+              CpuUtilization = 0,
+              TotalCores = 0,
+              UsedCores = 0,
+              TotalMemory = 0,
+              UsedMemory = 0
+            };
+            i = 1;
+          } else {
+            ++i;
+          }
+        }
+      }
+    }
   }
 }