Changeset 4264 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

Timestamp:

08/19/10 13:30:56 (14 years ago)

Author:

cneumuel

Message:

Split up "State" to "JobState" and "SlaveState" (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (4 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Hive.Slave.ExecutionEngine;
+using System.IO;
+using System.Threading;
+using HeuristicLab.Core;
+using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 using HeuristicLab.Hive.Slave.Common;
-using System.Threading;
-using System.Reflection;
-using System.Diagnostics;
-using System.Security.Permissions;
-using System.Security.Policy;
-using System.Security;
 using HeuristicLab.Hive.Slave.Communication;
-using HeuristicLab.Hive.Contracts.BusinessObjects;
-using HeuristicLab.Hive.Contracts;
-using System.Runtime.Remoting.Messaging;
-using HeuristicLab.PluginInfrastructure;
-using System.ServiceModel;
-using System.ServiceModel.Description;
+using HeuristicLab.Hive.Slave.Communication.ServerService;
 using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
 using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
-using HeuristicLab.Hive.Slave.Communication.ServerService;
-using HeuristicLab.Hive.JobBase;
 using HeuristicLab.Hive.Slave.Core.JobStorage;
+using HeuristicLab.Hive.Slave.ExecutionEngine;
 using HeuristicLab.Tracing;
-using HeuristicLab.Core;
-using System.IO;
-using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -102 +90 @@
 
       //Initialize the heartbeat
-      beat = new Heartbeat { Interval = 10000 };
+      beat = new Heartbeat { Interval = new TimeSpan(0, 0, 10) };
       beat.StartHeartbeat();
 
@@ -171 +159 @@
           Logger.Info("Uptime Limit reached, storing jobs and sending them back");
 
-          //check if there are running jobs
-          if (engines.Count > 0) {
-            //make sure there is no more fetching of jobs while the snapshots get processed
-            CurrentlyFetching = true;
-            //request a snapshot of each running job
-            foreach (KeyValuePair<Guid, Executor> kvp in engines) {
-              kvp.Value.RequestSnapshot();
-            }
-
-          } else {
-            //Disconnect afterwards
-            WcfService.Instance.Disconnect();
-          }
+          ShutdownRunningJobsAndSubmitSnapshots();
           break;
 
@@ -209 +185 @@
           WcfService.Instance.Logout(ConfigManager.Instance.GetClientInfo().Id);
           break;
+      }
+    }
+
+    private void ShutdownRunningJobsAndSubmitSnapshots() {
+      //check if there are running jobs
+      if (engines.Count > 0) {
+        //make sure there is no more fetching of jobs while the snapshots get processed
+        CurrentlyFetching = true;
+        //request a snapshot of each running job
+        foreach (KeyValuePair<Guid, Executor> kvp in engines) {
+          kvp.Value.RequestSnapshot();
+        }
+
       }
     }