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

Timestamp:

08/19/10 15:47:46 (14 years ago)

Author:

cneumuel

Message:

renamed all database entities from "Client" to "Slave" (#1157)
made slave-heartbeats synchronous, also they send HBs when timetable disallows them to calculate. they will appear on the server as Idle bis IsAllowedToCalculate will be false (#1159)

Location:

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

Files:

• ConfigurationManager/ConfigManager.cs (modified) (3 diffs)
• ConfigurationManager/UptimeManager.cs (modified) (1 diff)
• Core.cs (modified) (3 diffs)
• Heartbeat.cs (modified) (2 diffs)
• JobStorage/JobStorageManager.cs (modified) (1 diff)

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

@@ -47 +47 @@
 
     public Core Core { get; set; }    
-    private ClientDto hardwareInfo;        
+    private SlaveDto hardwareInfo;        
 
     /// <summary>
@@ -53 +53 @@
     /// </summary>
     private ConfigManager() {      
-      hardwareInfo = new ClientDto();
+      hardwareInfo = new SlaveDto();
 
       if (Settings.Default.Guid == Guid.Empty) {
@@ -71 +71 @@
     /// </summary>
     /// <returns>the ClientInfo object</returns>
-    public ClientDto GetClientInfo() {
+    public SlaveDto GetClientInfo() {
       hardwareInfo.Login = WcfService.Instance.ConnectedSince;
       return hardwareInfo;          

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

@@ -84 +84 @@
     }
 
-    public bool IsOnline() {
+    public bool IsAllowedToCalculate() {
       return AppContainer.Appointments.Any(app => (DateTime.Now >= app.StartDate) && (DateTime.Now <= app.EndDate));
     }

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

@@ -220 +220 @@
         byte[] sJob = engines[jId].GetFinishedJob();
 
-        if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
+        if (WcfService.Instance.LoggedIn) {
           Logger.Info("Sending the finished job with id: " + jId);
           wcfService.GetFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, engines[jId].CurrentException, true);
@@ -247 +247 @@
       //Uptime Limit reached, now is a good time to destroy this jobs.
       Logger.Debug("Checking if uptime limit is reached");
-      if (!UptimeManager.Instance.IsOnline()) {
+      if (!UptimeManager.Instance.IsAllowedToCalculate()) {
         Logger.Debug("Uptime limit reached");
         Logger.Debug("Killing Appdomain");
@@ -394 +394 @@
       //if the fetching from the server failed - still set the client online... maybe we get 
       //a result within the next few heartbeats      
-      if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline()) {
-        Logger.Info("CalendarAvailable is " + UptimeManager.Instance.CalendarAvailable + " and IsOnline is: " + UptimeManager.Instance.IsOnline());
+      //if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline()) {
+        Logger.Info("CalendarAvailable is " + UptimeManager.Instance.CalendarAvailable + " and IsOnline is: " + UptimeManager.Instance.IsAllowedToCalculate());
         Logger.Info("Setting client online");
         wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
         JobStorageManager.CheckAndSubmitJobsFromDisc();
         CurrentlyFetching = false;
-      }
+      //}
     }
 

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

@@ -79 +79 @@
             // check if cwfService is disconnected for any reason (should happen at first heartbeat)
             // [chn] TODO: Client should always send heartbeats. when calendar disallows he should tell the server he does not want to compute anything
-            if (wcfService.ConnState == NetworkEnum.WcfConnState.Disconnected) {
-              wcfService.Connect();
+            if (wcfService.ConnState != NetworkEnum.WcfConnState.Connected) {
+              wcfService.Connect(); // Login happens automatically upon successufl connection
+            }
+            if (!wcfService.LoggedIn) {
+              wcfService.LoginSync(ConfigManager.Instance.GetClientInfo()); // if login faild previously try again
             }
 
-            if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
-
-              // client is allowed to calculate stuff
-              ClientDto info = ConfigManager.Instance.GetClientInfo();
+            if (wcfService.LoggedIn) {
+              SlaveDto info = ConfigManager.Instance.GetClientInfo();
               
               HeartBeatData heartBeatData = new HeartBeatData {
@@ -93 +94 @@
                 FreeMemory = GetFreeMemory(),
                 JobProgress = ConfigManager.Instance.GetProgressOfAllJobs(),
-                IsAllowedToCalculate = UptimeManager.Instance.IsOnline() && UptimeManager.Instance.CalendarAvailable
+                IsAllowedToCalculate = UptimeManager.Instance.IsAllowedToCalculate() && UptimeManager.Instance.CalendarAvailable
               };
 

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

@@ -45 +45 @@
     public static void CheckAndSubmitJobsFromDisc() {
       for (int index = storedJobsList.Count; index > 0; index--) {
-        if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin && (storedJobsList[index - 1].ServerIP == WcfService.Instance.ServerIP && storedJobsList[index - 1].ServerPort == WcfService.Instance.ServerPort)) {
+        if (WcfService.Instance.LoggedIn && (storedJobsList[index - 1].ServerIP == WcfService.Instance.ServerIP && storedJobsList[index - 1].ServerPort == WcfService.Instance.ServerPort)) {
           String filename = storedJobsList[index - 1].ServerIP + "." + storedJobsList[index - 1].ServerPort + "." + storedJobsList[index - 1].JobID.ToString();
           Logger.Info("Sending stored job " + storedJobsList[index - 1].JobID + " to the server");