Changeset 6941

Timestamp:

10/28/11 17:51:46 (12 years ago)

Author:

ascheibe

Message:

#1233

• corrected total execution time in hive shown on status page
• Job Manager: don't poll already finished jobs

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx (modified) (1 diff)
• HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -516 +516 @@
       }
       if (this.HiveTasks != null && this.HiveTasks.Count > 0 && this.GetAllHiveTasks().All(x => x.Task.Id != Guid.Empty)) {
-        if (this.RefreshAutomatically)
+        if (IsFinished()) {
+          this.ExecutionState = Core.ExecutionState.Stopped;
+          this.RefreshAutomatically = false;
+        }
+
+        if (this.RefreshAutomatically) {
           StartResultPolling();
+        }
       }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx

@@ -26 +26 @@
     <asp:Label ID="cpuUtilizationLabel" runat="server" />
     <br />
-    Total ExecutionTime on Hive:
+    ExecutionTime on Hive:
     <asp:Label ID="totalExecutionTimeLabel" runat="server" />
     <br />

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

@@ -64 +64 @@
 
     HeuristicLab.Services.Hive.DataTransfer.Statistics[] stats;
-    if (daysDropDownList.SelectedValue == "All")
+    if (daysDropDownList.SelectedValue == "All") {
       stats = dao.GetStatistics(x => true).OrderBy(x => x.TimeStamp).ToArray();
-    else
+    } else {
       stats = dao.GetStatistics(x => x.Timestamp >= DateTime.Now.Subtract(TimeSpan.FromDays(int.Parse(daysDropDownList.SelectedValue)))).OrderBy(x => x.TimeStamp).ToArray();
-
-    var firstStatisticsDate = DateTime.Parse("2011-05-24 17:16:40");
-    var statisticsSince = DateTime.Now - firstStatisticsDate;
+    }
+                                                     
     if (stats.Length != 0) {
+      var firstStatisticsDate = stats.OrderBy(x => x.TimeStamp).First().TimeStamp;
+      var statisticsSince = DateTime.Now - firstStatisticsDate;
       totalExecutionTimeLabel.Text = new TimeSpan(stats.Last().UserStatistics.Sum(x => x.ExecutionTime.Ticks)).ToString() + " (since " + Math.Round(statisticsSince.TotalDays, 2) + " days)";
     } else {