Changeset 12551 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/GroupController.cs

Timestamp:

06/30/15 13:12:07 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated database schema
• updated sql scripts
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

HeuristicLab.Services.WebApp.Status-3.3:

• updated data api controller

HeuristicLab.Services.WebApp.Statistics-3.3:

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

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/GroupController.cs (modified) (4 diffs)

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

@@ -38 +38 @@
         var dimClientDao = pm.DimClientDao;
         var factClientInfoDao = pm.FactClientInfoDao;
+        var factTaskDao = pm.FactTaskDao;
         return pm.UseTransaction(() => {
+          var clientTimeData = factClientInfoDao.GetAll()
+            .Join(dimClientDao.GetAll(), x => x.ClientId, y => y.Id, (x, y) => new {
+              y.ResourceGroupId,
+              x.IdleTime,
+              x.OfflineTime,
+              x.UnavailableTime
+            })
+            .Where(x => x.ResourceGroupId == id)
+            .GroupBy(x => x.ResourceGroupId)
+            .Select(x => new {
+              TotalIdleTime = x.Sum(y => y.IdleTime),
+              TotalOfflineTime = x.Sum(y => y.OfflineTime),
+              TotalUnavailableTime = x.Sum(y => y.UnavailableTime)
+            })
+            .FirstOrDefault();
+
+          var taskTimeData = factTaskDao.GetByGroupId(id)
+            .Select(x => new {
+              id,
+              x.CalculatingTime,
+              x.TransferTime
+            })
+            .GroupBy(x => x.id)
+            .Select(x => new {
+              CalculatingTime = x.Sum(y => y.CalculatingTime),
+              TransferTime = x.Sum(y => y.TransferTime)
+            })
+            .FirstOrDefault();
           return (from client in dimClientDao.GetActiveClients().Where(x => x.ResourceGroupId == id)
                   join info in factClientInfoDao.GetAll()
@@ -51 +80 @@
                     TotalMemory = clientInfo.TotalMemory,
                     UsedMemory = offline ? 0 : clientInfo.UsedMemory,
-                    CpuUtilization = offline ? 0 : clientInfo.CpuUtilization
+                    CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
+                    SlaveState = clientInfo.SlaveState
                   })
             .GroupBy(x => new { x.ResourceGroupId, x.GroupName })
             .Select(x => new DT.GroupDetails {
-              Id = x.Key.ResourceGroupId ?? default(Guid),
+              Id = id,
               Name = x.Key.GroupName,
-              Clients = x.Count(),
+              TotalClients = x.Count(),
+              OnlineClients = x.Count(y => y.SlaveState != DA.SlaveState.Offline),
               TotalCores = x.Sum(y => y.TotalCores),
               UsedCores = x.Sum(y => y.UsedCores),
               TotalMemory = x.Sum(y => y.TotalMemory),
               UsedMemory = x.Sum(y => y.UsedMemory),
-              CpuUtilization = x.Average(y => y.CpuUtilization)
+              TotalCpuUtilization = x.Average(y => (double?)y.CpuUtilization) ?? 0.0,
+              ActiveCpuUtilization = x.Where(y => y.SlaveState != DA.SlaveState.Offline).Average(y => (double?)y.CpuUtilization) ?? 0.0,
+              TotalUnavailableTime = clientTimeData != null ? clientTimeData.TotalUnavailableTime : 0,
+              TotalCalculatingTime = taskTimeData != null ? taskTimeData.CalculatingTime : 0,
+              TotalIdleTime = clientTimeData != null ? clientTimeData.TotalIdleTime : 0,
+              TotalOfflineTime = clientTimeData != null ? clientTimeData.TotalOfflineTime : 0,
+              TotalTransferringTime = taskTimeData != null ? taskTimeData.TransferTime : 0,
+              TasksStates = factTaskDao.GetByGroupId(id)
+                                    .GroupBy(y => y.TaskState)
+                                    .Select(y => new DT.TaskStateCount {
+                                      State = y.Key.ToString(),
+                                      Count = y.Count()
+                                    }).ToList()
             }).FirstOrDefault();
         });
@@ -83 +126 @@
                       TotalMemory = clientInfo.TotalMemory,
                       UsedMemory = offline ? 0 : clientInfo.UsedMemory,
-                      CpuUtilization = offline ? 0 : clientInfo.CpuUtilization
+                      CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
+                      SlaveState = clientInfo.SlaveState
                     }).GroupBy(x => x.ResourceGroupId).Select(x => new {
                       GroupId = x.Key,
-                      Count = x.Count(),
+                      TotalClients = x.Count(),
+                      OnlineClients = x.Count(y => y.SlaveState != DA.SlaveState.Offline),
                       TotalCores = x.Sum(y => y.TotalCores),
                       UsedCores = x.Sum(y => y.UsedCores),
                       TotalMemory = x.Sum(y => y.TotalMemory),
                       UsedMemory = x.Sum(y => y.UsedMemory),
-                      CpuUtilization = x.Average(y => y.CpuUtilization)
+                      CpuUtilization = x.Where(y => y.SlaveState != DA.SlaveState.Offline).Average(y => (double?)y.CpuUtilization) ?? 0.0
                     });
         var query = dimClientDao.GetAll()
@@ -108 +153 @@
               Id = group.Id,
               Name = group.Name,
-              Clients = info.Count,
+              TotalClients = info.TotalClients,
+              OnlineClients = info.OnlineClients,
               TotalCores = info.TotalCores,
               UsedCores = info.UsedCores,