Changeset 5826 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave

Timestamp:

03/24/11 16:15:23 (14 years ago)

Author:

ascheibe

Message:

#1233 slave ui now receives status information and displays it in doughnut chart

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• Core.cs (modified) (20 diffs)
• Executor.cs (modified) (4 diffs)
• HeartbeatManager.cs (modified) (2 diffs)
• ServiceContracts/ISlaveCommunication.cs (modified) (1 diff)
• SlaveCommunicationService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -24 +24 @@
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.ServiceModel;
 using System.Threading;
@@ -33 +32 @@
 
 
-
 namespace HeuristicLab.Clients.Hive.SlaveCore {
   /// <summary>
-  /// The core component of the Hive Client
+  /// The core component of the Hive Slave. 
+  /// Handles commands sent from the Hive Server. 
   /// </summary>
   public class Core : MarshalByRefObject {
-
-    //TODO: this class should be a singleton; there is only one instance, the reference is meanwhile save in TheCore
-    public static Core TheCore;
-
     public EventLog ServiceEventLog { get; set; }
 
@@ -68 +63 @@
     }
 
-    public Core() {
-      TheCore = this;
-    }
+    public Core() { }
 
     /// <summary>
@@ -80 +73 @@
 
       try {
+        ConfigManager manager = ConfigManager.Instance;
+        manager.Core = this;
+
         //start the client communication service (pipe between slave and slave gui)
         slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
@@ -87 +83 @@
         clientCom.LogMessage("Hive Slave started");
 
-        ConfigManager manager = ConfigManager.Instance;
-        manager.Core = this;
-
         wcfService = WcfService.Instance;
         RegisterServiceEvents();
 
-        StartHeartbeats(); // Start heartbeats thread
+        StartHeartbeats(); // Start heartbeats thread        
         DispatchMessageQueue(); // dispatch messages until abortRequested
       }
@@ -125 +118 @@
         MessageContainer container = queue.GetMessage();
         DetermineAction(container);
+        clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
       }
     }
@@ -149 +143 @@
     /// Reads and analyzes the Messages from the MessageQueue and starts corresponding actions
     /// </summary>
-    /// <param name="container">The Container, containing the message</param>
+    /// <param name="container">The container, containing the message</param>
     private void DetermineAction(MessageContainer container) {
       clientCom.LogMessage("Message: " + container.Message.ToString() + " for job: " + container.JobId);
@@ -169 +163 @@
               }
               JobData jobData = wcfService.GetJobData(job.Id);
-              if (job == null) throw new JobDataNotFoundException(jobId);
+              if (jobData == null) throw new JobDataNotFoundException(jobId);
+              SlaveStatusInfo.JobsFetched++;
               job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null);
               StartJobInAppDomain(job, jobData);
@@ -228 +223 @@
             clientCom.LogMessage("Sending the paused job with id: " + job.Id);
             wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Paused);
-            SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
           }
           catch (Exception e) {
@@ -254 +248 @@
             clientCom.LogMessage("Sending the stoppped job with id: " + job.Id);
             wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
-            SlaveStatusInfo.JobsProcessed++;    //TODO: count or not count, thats the question
           }
           catch (Exception e) {
@@ -365 +358 @@
     /// stop slave, except for client gui communication, 
     /// primarily used by gui if core is running as windows service
-    /// </summary>
-    //TODO: do we need an AbortSleep?
+    /// </summary>    
     private void Sleep() {
       clientCom.LogMessage("Sleep received");
@@ -380 +372 @@
     /// atm only used when executor is waiting for child jobs
     /// </summary>
-    /// <param name="data"></param>
-    [MethodImpl(MethodImplOptions.Synchronized)]
     public void PauseWaitJob(JobData data) {
       if (!Jobs.ContainsKey(data.JobId)) {
@@ -397 +387 @@
     /// once the connection gets reestablished, the job gets submitted
     /// </summary>
-    /// <param name="jobId"></param>
-    [MethodImpl(MethodImplOptions.Synchronized)]
     public void SendFinishedJob(Guid jobId) {
       try {
@@ -413 +401 @@
         cJob.ExecutionTime = engines[jobId].ExecutionTime;
 
+        if (engines[jobId].Aborted) {
+          SlaveStatusInfo.JobsAborted++;
+        } else {
+          SlaveStatusInfo.JobsProcessed++;
+        }
+
+        if (engines[jobId].CurrentException != string.Empty) {
+          wcfService.UpdateJobState(jobId, JobState.Failed, engines[jobId].CurrentException);
+        }
+
         JobData sJob = engines[jobId].GetFinishedJob();
-        // cJob.Exception = engines[jId].CurrentException; // can there be an exception if the job is sent normally. the exception should be entered in the statelog with the corresponding state (Failed)
-        cJob.ExecutionTime = engines[jobId].ExecutionTime;
-
         try {
           clientCom.LogMessage("Sending the finished job with id: " + jobId);
           wcfService.UpdateJobData(cJob, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
-          SlaveStatusInfo.JobsProcessed++;
         }
         catch (Exception e) {
@@ -426 +420 @@
         }
         finally {
-          KillAppDomain(jobId); // kill app-domain in every case
+          KillAppDomain(jobId);
           heartbeatManager.AwakeHeartBeatThread();
         }
@@ -437 +431 @@
     /// <summary>
     /// A new Job from the wcfService has been received and will be started within a AppDomain.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
+    /// </summary>    
     private void StartJobInAppDomain(Job myJob, JobData jobData) {
       clientCom.LogMessage("Received new job with id " + myJob.Id);
+      clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
       if (engines.ContainsKey(myJob.Id))
         throw new Exception("Job with key " + myJob.Id + " already exists");
@@ -472 +465 @@
             engines.Add(myJob.Id, engine);
             engine.Start(jobData.Data);
-            SlaveStatusInfo.JobsFetched++;
-            clientCom.LogMessage("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
           }
         }
@@ -501 +492 @@
     /// This is necessary if the core thread has to execute certain actions, e.g.
     /// killing of an app domain. 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="action"></param>
-    /// <param name="parameter"></param>
+    /// </summary>    
     /// <returns>true if the calling method can continue execution, else false</returns>
     public void EnqueueExecutorMessage<T>(Action<T> action, T parameter) {
@@ -516 +504 @@
     /// Kill a appdomain with a specific id.
     /// </summary>
-    /// <param name="id">the GUID of the job</param>
-    //[MethodImpl(MethodImplOptions.Synchronized)]
+    /// <param name="id">the GUID of the job</param>    
     public void KillAppDomain(Guid id) {
       if (Thread.CurrentThread.ManagedThreadId != this.coreThreadId) {
@@ -562 +549 @@
       }
       GC.Collect();
+      clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

@@ -38 +38 @@
     private Semaphore pauseStopSem = new Semaphore(0, 1);
 
+    public bool Aborted { get; set; }
+
     private Exception currentException;
     public String CurrentException {
@@ -68 +70 @@
       try {
         CreationTime = DateTime.Now;
+        Aborted = false;
         Job = PersistenceUtil.Deserialize<IJob>(serializedJob);
 
@@ -182 +185 @@
       currentException = ex.Value;
       Core.EnqueueExecutorMessage(Core.SendFinishedJob, JobId);
+      Aborted = true;
     }
 
@@ -187 +191 @@
       if (wasJobAborted) {
         pauseStopSem.Release();
+        Aborted = true;
       } else {
-        //it's a clean and finished job, so send it
+        //it's a clean and finished job, so send it        
         Core.EnqueueExecutorMessage(Core.SendFinishedJob, JobId);
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs

@@ -78 +78 @@
       while (!threadStopped) {
         sleepForever = false;
+        SlaveClientCom.Instance.ClientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
+
         try {
           lock (locker) {
             if (wcfService.ConnState != NetworkEnum.WcfConnState.Connected) {
-              wcfService.Connect(ConfigManager.Instance.GetClientInfo()); // Login happens automatically upon successfull connection
+              // login happens automatically upon successfull connection
+              wcfService.Connect(ConfigManager.Instance.GetClientInfo());
+              SlaveStatusInfo.LoginTime = DateTime.Now;
             }
             if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
@@ -111 +115 @@
         }
         catch (Exception e) {
-          SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Thread failed badly: " + e.Message);
+          SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat thread failed: " + e.ToString());
           OnExceptionOccured(e);
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ServiceContracts/ISlaveCommunication.cs

@@ -49 +49 @@
     void AbortAll();
 
-    [OperationContract]
-    void ShutdownSlave();
-
     //callbacks
     [OperationContract]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs

@@ -33 +33 @@
       try {
         ISlaveCommunicationCallbacks callback = OperationContext.Current.GetCallbackChannel<ISlaveCommunicationCallbacks>();
-        if (!subscribers.Contains(callback))
+        if (!subscribers.Contains(callback)) {
           subscribers.Add(callback);
+        }
         return true;
       }
@@ -99 +100 @@
     }
 
-    public void ShutdownSlave() {
-      Core.TheCore.Shutdown();
-    }
-
     public void AbortAll() {
       MessageContainer mc = new MessageContainer(MessageContainer.MessageType.AbortAll);