Changeset 2025 for trunk

Timestamp:

06/05/09 14:40:53 (15 years ago)

Author:

kgrading

Message:

added calendar behavior in the whole application (#669)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/UptimeManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (5 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/MessageContainer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

@@ -76 +76 @@
     public void Connect() {
       try {
+        if (String.Empty.Equals(ServerIP) || ServerPort == 0) {
+          Logging.Instance.Info(this.ToString(), "No Server IP or Port set!");
+          return;
+        }
         proxy = new ClientFacadeClient(
           WcfSettings.GetStreamedBinding(),
@@ -118 +122 @@
           ServerChanged(this, new EventArgs());
     }
+
+    public void SetIPAndPort(String serverIP, int serverPort) {
+      this.ServerIP = serverIP;
+      this.ServerPort = serverPort;
+    }
     
     /// <summary>
@@ -159 +168 @@
           if (!res.Success) {
             Logging.Instance.Error(this.ToString(), "Login Failed! " + res.StatusMessage);
-            HandleNetworkError(null);
+            HandleNetworkError(new Exception(res.StatusMessage));
           } else {
             ConnState = NetworkEnum.WcfConnState.Loggedin;

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/UptimeManager.cs

@@ -72 +72 @@
     }
 
-    public bool isOnline(DateTime time) {
+    public bool isOnline() {
       foreach (Appointment app in Appointments)
-        if ((time >= app.StartDate) &&
-            (time <= app.EndDate))
+        if ((DateTime.Now >= app.StartDate) &&
+            (DateTime.Now <= app.EndDate))
           return true;
       return false;

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -86 +86 @@
       //Recover Server IP and Port from the Settings Framework
       ConnectionContainer cc = ConfigManager.Instance.GetServerIPAndPort();     
-      if (cc.IPAdress != String.Empty && cc.Port != 0) {
-        wcfService.Connect(cc.IPAdress, cc.Port);
-      }
-   
+      if (cc.IPAdress != String.Empty && cc.Port != 0)
+        wcfService.SetIPAndPort(cc.IPAdress, cc.Port);
+
+      if (UptimeManager.Instance.isOnline())
+        wcfService.Connect();
+         
       //Initialize the heartbeat
       beat = new Heartbeat { Interval = 10000 };
@@ -122 +124 @@
           break;
         //Job has been successfully aborted
-        case MessageContainer.MessageType.JobAborted:
-          //todo: thread this
+
+
+        case MessageContainer.MessageType.JobAborted:          
+        //todo: thread this
           Debug.WriteLine("Job aborted, he's dead");
           lock (engines) {            
@@ -138 +142 @@
           }
           break;
+        
+        
         //Request a Snapshot from the Execution Engine
         case MessageContainer.MessageType.RequestSnapshot:
@@ -145 +151 @@
             Logging.Instance.Error(this.ToString(), "RequestSnapshot: Engine doesn't exist");
           break;
+        
+        
         //Snapshot is ready and can be sent back to the Server
         case MessageContainer.MessageType.SnapshotReady:
           ThreadPool.QueueUserWorkItem(new WaitCallback(GetSnapshot), container.JobId);          
           break;
+        
+        
         //Pull a Job from the Server
         case MessageContainer.MessageType.FetchJob:
@@ -156 +166 @@
           }          
           break;          
+        
+        
         //A Job has finished and can be sent back to the server
         case MessageContainer.MessageType.FinishedJob:
           ThreadPool.QueueUserWorkItem(new WaitCallback(GetFinishedJob), container.JobId);          
           break;     
+        
+        
+        case MessageContainer.MessageType.UptimeLimitDisconnect:
+          Logging.Instance.Info(this.ToString(), "Uptime Limit reached, storing jobs and sending them back");
+          WcfService.Instance.Disconnect();
+          break;
+        
+        
         //Hard shutdown of the client
         case MessageContainer.MessageType.Shutdown:

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs

@@ -39 +39 @@
   /// </summary>
   public class Heartbeat {
+
+    private bool offline;
+
     public double Interval { get; set; }    
     private Timer heartbeatTimer = null;
@@ -72 +75 @@
     void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
       Console.WriteLine("tick");  
-      ClientInfo info = ConfigManager.Instance.GetClientInfo();
-      // Todo: remove tempfix for free cores.
+      ClientInfo info = ConfigManager.Instance.GetClientInfo();      
 
       PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
       int mb = (int)(counter.NextValue() / 1024 / 1024);
-
-      
 
       HeartBeatData heartBeatData = new HeartBeatData {
@@ -84 +84 @@
         FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
         FreeMemory = mb,
-        JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()
+        JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()      
       };
+      
+      DateTime lastFullHour = DateTime.Parse(DateTime.Now.Hour.ToString() + ":00");
+      TimeSpan span = DateTime.Now - lastFullHour;
+      if (span.TotalSeconds < (Interval/1000)) {
+        if (UptimeManager.Instance.isOnline()) {
+          //That's quiet simple: Just reconnect and you're good for new jobs
+          if (wcfService.ConnState != NetworkEnum.WcfConnState.Connected) {
+            Logging.Instance.Info(this.ToString(), "Client goes online according to timetable");
+            wcfService.Connect();
+          }
+        } else {
+          //We have quit a lot of work to do here: snapshot all jobs, submit them back, then disconnect and then pray to god that nothing goes wrong
+          MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.UptimeLimitDisconnect);                  
+        }        
+      }
       if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
         wcfService.Connect();

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs

@@ -47 +47 @@
           String filename = storedJobsList[index-1].ServerIP + "." + storedJobsList[index-1].ServerPort + "." + storedJobsList[index-1].JobID.ToString();          
           Logging.Instance.Info("JobStorrageManager", "Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
-          byte[] job = File.ReadAllBytes(path + filename + ".dat");
-
-          if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT) {
-            ResponseResultReceived res = WcfService.Instance.SendStoredJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
-            if (!res.Success)
-              Logging.Instance.Error("JobStorageManager", "sending of job failed: " + res.StatusMessage);
-            else
-              Logging.Instance.Info("JobStorrageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");      
+          try {
+            byte[] job = File.ReadAllBytes(path + filename + ".dat");
+            if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT) {
+              ResponseResultReceived res = WcfService.Instance.SendStoredJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
+              if (!res.Success)
+                Logging.Instance.Error("JobStorageManager", "sending of job failed: " + res.StatusMessage);
+              else
+                Logging.Instance.Info("JobStorrageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");
+            }
+            ClientStatusInfo.JobsProcessed++;
+            storedJobsList.Remove(storedJobsList[index - 1]);
+            File.Delete(path + filename + ".dat"); 
           }
-          ClientStatusInfo.JobsProcessed++;
-                  
-          
-
-          storedJobsList.Remove(storedJobsList[index - 1]);
-          File.Delete(path + filename + ".dat");       
+          catch (Exception e) {
+            Logging.Instance.Error("JobStorrageManager", "Job not on hdd but on list - deleting job from list", e);
+            storedJobsList.Remove(storedJobsList[index - 1]);
           }
+      
+         }
         }
     }

trunk/sources/HeuristicLab.Hive.Contracts/3.2/MessageContainer.cs

@@ -33 +33 @@
   public class MessageContainer {
 
-    public enum MessageType { FetchJob, AbortJob, JobAborted, RequestSnapshot, FinishedJob, NoMessage, SnapshotReady, Shutdown, JobFailed };
+    public enum MessageType { FetchJob, AbortJob, JobAborted, RequestSnapshot, FinishedJob, NoMessage, SnapshotReady, Shutdown, JobFailed, UptimeLimitDisconnect };
 
     public MessageType Message { get; set; }