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

Timestamp:

05/10/11 17:58:59 (13 years ago)

Author:

cneumuel

Message:

#1233

• added semaphores to ensure an appdomain is never unloaded when the start method has not finished
• HiveEngine uploading and downloading of jobs works and is displayed in the view

Location:

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

Files:

• Core.cs (modified) (4 diffs)
• Executor.cs (modified) (1 diff)
• PluginCache.cs (modified) (1 diff)

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

@@ -47 +47 @@
     private Dictionary<Guid, Executor> executors = new Dictionary<Guid, Executor>();
     private Dictionary<Guid, AppDomain> appDomains = new Dictionary<Guid, AppDomain>();
+
+    // signalizes if the Executor.Start method has properly finished. only then the appdomain may be unloaded
+    private Dictionary<Guid, Semaphore> semaphores = new Dictionary<Guid, Semaphore>();
 
     private WcfService wcfService;
@@ -484 +487 @@
             executor.MemoryNeeded = job.MemoryNeeded;
             clientCom.LogMessage("Starting Executor for job " + job.Id);
-            executor.Start(jobData.Data);
             lock (executors) {
               executors.Add(job.Id, executor);
             }
+            semaphores[job.Id] = new Semaphore(0, 1);
+            executor.Start(jobData.Data);
+            semaphores[job.Id].Release();
           }
           catch (Exception exception) {
@@ -535 +540 @@
     /// Kill a appdomain with a specific id.
     /// </summary>
-    /// <param name="id">the GUID of the job</param>    
-    public void KillAppDomain(Guid id) {
+    /// <param name="jobId">the GUID of the job</param>    
+    public void KillAppDomain(Guid jobId) {
       if (Thread.CurrentThread.ManagedThreadId != this.coreThreadId) {
-        EnqueueExecutorMessage<Guid>(KillAppDomain, id);
+        EnqueueExecutorMessage<Guid>(KillAppDomain, jobId);
         return;
       }
 
-      clientCom.LogMessage("Shutting down Appdomain for Job " + id);
+      clientCom.LogMessage("Shutting down Appdomain for Job " + jobId);
       lock (executors) {
         try {
-          if (executors.ContainsKey(id)) {
-            executors[id].Dispose();
-            executors.Remove(id);
-          }
-
-          if (appDomains.ContainsKey(id)) {
-            appDomains[id].UnhandledException -= new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
-
+          if (executors.ContainsKey(jobId)) {
+            executors[jobId].Dispose();
+            executors.Remove(jobId);
+          }
+
+          if (appDomains.ContainsKey(jobId)) {
+            appDomains[jobId].UnhandledException -= new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
             int repeat = 5;
             while (repeat > 0) {
               try {
-                AppDomain.Unload(appDomains[id]);
+                semaphores[jobId].WaitOne();
+                AppDomain.Unload(appDomains[jobId]);
+                semaphores[jobId].Dispose();
+                semaphores.Remove(jobId);
                 repeat = 0;
               }
@@ -569 +576 @@
               }
             }
-            appDomains.Remove(id);
-          }
-
-          PluginCache.Instance.DeletePluginsForJob(id);
+            appDomains.Remove(jobId);
+          }
+
+          PluginCache.Instance.DeletePluginsForJob(jobId);
           GC.Collect();
         }

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

@@ -89 +89 @@
         } else {
           Job.Start();
-          startJobSem.WaitOne();
+          if (!startJobSem.WaitOne(TimeSpan.FromSeconds(15))) {
+            throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
+          }
         }
       }
       catch (Exception e) {
         this.currentException = e;
-        Job_JobFailed(this, new HeuristicLab.Common.EventArgs<Exception>(e));
+        Job_JobFailed(this, new EventArgs<Exception>(e));
       }
     }

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

@@ -278 +278 @@
     internal void DeletePluginsForJob(Guid id) {
       try {
-        SlaveClientCom.Instance.ClientCom.LogMessage("unloading...");
+        SlaveClientCom.Instance.ClientCom.LogMessage("Deleting plugins...");
         int tries = 5;
         while (tries > 0) {