Changeset 11255

Timestamp:

08/01/14 16:31:09 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs

@@ -99 +99 @@
                              join clients in db.DimClients
                                on client.ClientId equals clients.Id
-                             where clients.ExpirationTime == null
+                             join resource in db.Resources.OfType<Slave>()
+                               on clients.ResourceId equals resource.ResourceId
+                             where clients.ExpirationTime == null &&
+                             (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
                              select new { client.ClientId, client.CpuUtilization, client.Time })
                              .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
@@ -117 +120 @@
                             join clients in db.DimClients
                               on client.ClientId equals clients.Id
-                            where clients.ExpirationTime == null
+                            join resource in db.Resources.OfType<Slave>()
+                             on clients.ResourceId equals resource.ResourceId
+                            where clients.ExpirationTime == null &&
+                            (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
                             select new { client.ClientId, client.NumTotalCores, client.NumUsedCores, client.Time })
                             .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
@@ -136 +142 @@
                             join clients in db.DimClients
                               on client.ClientId equals clients.Id
-                            where clients.ExpirationTime == null
+                            join resource in db.Resources.OfType<Slave>()
+                              on clients.ResourceId equals resource.ResourceId
+                            where clients.ExpirationTime == null &&
+                            (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
                             select new { client.ClientId, client.TotalMemory, client.UsedMemory, client.Time })
                             .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();