Changeset 6946

Timestamp:

11/04/11 11:20:22 (13 years ago)

Author:

ascheibe

Message:

#1233

• disable logging of the user statistics on the server because of high run time demands
• also show in the slave UI the timestamps of arrived messages

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.cs

@@ -69 +69 @@
     #region Event Handlers
     void Content_SlaveMessageLogged(object sender, EventArgs<string> e) {
+      string msg = string.Format("{0}: {1} {2}", DateTime.Now.ToString("HH:mm:ss"), e.Value, Environment.NewLine);
+
       if (txtLog.InvokeRequired) {
-        txtLog.Invoke(new Action<string>(txtLog.AppendText), e.Value + Environment.NewLine);
+        txtLog.Invoke(new Action<string>(txtLog.AppendText), msg);
       } else {
-        txtLog.AppendText(e.Value + Environment.NewLine);
+        txtLog.AppendText(msg);
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -722 +722 @@
           db.SlaveStatistics.InsertOnSubmit(DT.Convert.ToEntity(slaveStat));
         }
-        foreach (var userStat in dto.UserStatistics) {
-          userStat.Id = entity.StatisticsId;
-          db.UserStatistics.InsertOnSubmit(DT.Convert.ToEntity(userStat));
+        if (dto.UserStatistics != null) {
+          foreach (var userStat in dto.UserStatistics) {
+            userStat.Id = entity.StatisticsId;
+            db.UserStatistics.InsertOnSubmit(DT.Convert.ToEntity(userStat));
+          }
         }
         db.SubmitChanges();
@@ -755 +757 @@
         }
 
-        var executionTimesByUser = from job in db.Tasks
-                                   group job by job.Job.OwnerUserId into g
+        var executionTimesByUser = from task in db.Tasks
+                                   group task by task.Job.OwnerUserId into g
                                    select new { UserId = g.Key, ExecutionTime = TimeSpan.FromMilliseconds(g.Select(x => x.ExecutionTimeMs).Sum()) };
         foreach (var item in executionTimesByUser) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -67 +67 @@
       }
       stats.SlaveStatistics = slaveStats;
-      stats.UserStatistics = dao.GetUserStatistics();
+      //collecting user statistics slows down the db and results in timeouts. 
+      //we have to find another way to deal with this.  
+      //until then the next line is commented out...
+      //stats.UserStatistics = dao.GetUserStatistics();
       dao.AddStatistics(stats);
     }