Changeset 1830

Timestamp:

05/15/09 14:25:36 (16 years ago)

Author:

kgrading

Message:

removed handle on appdomains before unloading, made the whole core more stable for concurrency errors (#467)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (7 diffs)

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

@@ -114 +114 @@
         //Server requests to abort a job
         case MessageContainer.MessageType.AbortJob:
-          engines[container.JobId].Abort();
+          if(engines.ContainsKey(container.JobId))
+            engines[container.JobId].Abort();
+          else
+            Logging.Instance.Error(this.ToString(), "AbortJob: Engine doesn't exist");
           break;
         //Job has been successfully aborted
@@ -120 +123 @@
           //todo: thread this
           Debug.WriteLine("Job aborted, he's dead");
-          lock (engines) {
-            AppDomain.Unload(appDomains[container.JobId]);
-            appDomains.Remove(container.JobId);
-            engines.Remove(container.JobId);
-            jobs.Remove(container.JobId);
+          lock (engines) {            
+            Guid jobId = new Guid(container.JobId.ToString());
+            if(engines.ContainsKey(jobId)) {
+              appDomains[jobId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
+              AppDomain.Unload(appDomains[jobId]);
+              appDomains.Remove(jobId);
+              engines.Remove(jobId);
+              jobs.Remove(jobId);
+              GC.Collect();
+            } else
+              Logging.Instance.Error(this.ToString(), "JobAbort: Engine doesn't exist");
           }
           break;
         //Request a Snapshot from the Execution Engine
         case MessageContainer.MessageType.RequestSnapshot:
-          engines[container.JobId].RequestSnapshot();
+          if (engines.ContainsKey(container.JobId)) 
+            engines[container.JobId].RequestSnapshot();
+          else
+            Logging.Instance.Error(this.ToString(), "RequestSnapshot: Engine doesn't exist");
           break;
         //Snapshot is ready and can be sent back to the Server
@@ -149 +161 @@
         case MessageContainer.MessageType.Shutdown:
           lock (engines) {
-            foreach (KeyValuePair<Guid, AppDomain> kvp in appDomains)
+            foreach (KeyValuePair<Guid, AppDomain> kvp in appDomains) {
+              appDomains[kvp.Key].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
               AppDomain.Unload(kvp.Value);
+            }
           }
           abortRequested = true;
@@ -165 +179 @@
       Guid jId = (Guid)jobId;      
       try {
+        if (!engines.ContainsKey(jId)) {
+          Logging.Instance.Error(this.ToString(), "GetFinishedJob: Engine doesn't exist");
+          return;
+        }
+        
         byte[] sJob = engines[jId].GetFinishedJob();
 
@@ -174 +193 @@
             null,
             true);
-        } else {          
+        } else {
           JobStorageManager.PersistObjectToDisc(wcfService.ServerIP, wcfService.ServerPort, jId, sJob);
           lock (engines) {
+            appDomains[jId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
             AppDomain.Unload(appDomains[jId]);
             appDomains.Remove(jId);
@@ -248 +268 @@
       lock(engines) {
         try {
+          appDomains[e.Result.JobId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           AppDomain.Unload(appDomains[e.Result.JobId]);
           appDomains.Remove(e.Result.JobId);
@@ -278 +299 @@
       Logging.Instance.Info(this.ToString(), "ServerChanged has been called");
       lock (engines) {
-        foreach (KeyValuePair<Guid, AppDomain> entries in appDomains)
+        foreach (KeyValuePair<Guid, AppDomain> entries in appDomains) {
+          appDomains[entries.Key].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           AppDomain.Unload(appDomains[entries.Key]);
+        }
         appDomains = new Dictionary<Guid, AppDomain>();
         engines = new Dictionary<Guid, Executor>();