Changeset 7187

Timestamp:

12/14/11 01:09:54 (13 years ago)

Author:

ascheibe

Message:

#1672

• increased times between life cycles on the server
• some smaller performance improvements on the server

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3

Files:

• HiveService.cs (modified) (1 diff)
• Manager/EventManager.cs (modified) (1 diff)
• Manager/HeartbeatManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -559 +559 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Slave);
       // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
+      bool cleanup = false;
       trans.UseTransaction(() => {
         DateTime lastCleanup = dao.GetLastCleanup();
-        if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
+        if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(140)) {
           dao.SetLastCleanup(DateTime.Now);
-          eventManager.Cleanup();
+          cleanup = true;
         }
       }, true);
+
+      if (cleanup) {
+        eventManager.Cleanup();
+      }
     }
     #endregion

trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -41 +41 @@
       get { return LogFactory.GetLogger(this.GetType().Namespace); }
     }
+    private DataAccess.ITransactionManager trans {
+      get { return ServiceLocator.Instance.TransactionManager; }
+    }
 
-    public void Cleanup() {
-      SetTimeoutSlavesOffline();
-      SetTimeoutTasksWaiting();
-      FinishParentTasks();
-      UpdateStatistics();
+    public void Cleanup() { 
+      trans.UseTransaction(() => {
+        SetTimeoutSlavesOffline();
+        SetTimeoutTasksWaiting();
+      }, true);
+
+      trans.UseTransaction(() => {
+        FinishParentTasks();
+        UpdateStatistics();
+      }, false);
     }
 

trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -44 +44 @@
       if (slave == null) {
         actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
-      } else {
-        Slave s = dao.GetSlave(heartbeat.SlaveId);
-        if (s != null) {
-          if (heartbeat.HbInterval != s.HbInterval) {
-            actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
-          }
+      } else {        
+        if (heartbeat.HbInterval != slave.HbInterval) {
+          actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
         }
-
+        
         // update slave data
         slave.FreeCores = heartbeat.FreeCores;