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

Timestamp:

05/02/11 19:07:24 (13 years ago)

Author:

ascheibe

Message:

#1233

• don't lock engines for so long in StartJobInAppDomain
• move SlaveCommListener to ConsoleClient
• delete orphaned job folders at startup

Location:

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

Files:

• Core.cs (modified) (3 diffs)
• PluginCache.cs (modified) (1 diff)

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

@@ -79 +79 @@
         slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
         slaveComm.Open();
-
         clientCom = SlaveClientCom.Instance.ClientCom;
+
+        // delete all left over job directories
+        PluginCache.Instance.CleanPluginTemp();
         clientCom.LogMessage("Hive Slave started");
 
@@ -483 +485 @@
             AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
             appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
+            Executor engine;
             lock (engines) {
               appDomains.Add(myJob.Id, appDomain);
               clientCom.LogMessage("Creating AppDomain");
-              Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+              engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
               clientCom.LogMessage("Created AppDomain");
               engine.JobId = myJob.Id;
@@ -492 +495 @@
               clientCom.LogMessage("Starting Engine for job " + myJob.Id);
               engines.Add(myJob.Id, engine);
-              engine.Start(jobData.Data);
             }
-
+            engine.Start(jobData.Data);
           }
           catch (Exception exception) {

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

@@ -231 +231 @@
 
     /// <summary>
+    /// Checks the PluginTemp directory for orphaned directories and deletes them.
+    /// This should be only called if no jobs are currently running.
+    /// </summary>    
+    public void CleanPluginTemp() {
+      if (Directory.Exists(PluginTempBaseDir)) {
+        foreach (string dir in Directory.EnumerateDirectories(PluginTempBaseDir)) {
+          try {
+            SlaveClientCom.Instance.ClientCom.LogMessage("Deleting orphaned directory " + dir);
+            Directory.Delete(dir, true);
+          }
+          catch (Exception ex) {
+            SlaveClientCom.Instance.ClientCom.LogMessage("Error cleaning up PluginTemp directory " + dir + ": " + ex.ToString());
+          }
+        }
+      }
+    }
+
+    /// <summary>
     /// checks the pluginCacheDirectory and deletes plugin folders which are not used anymore
-    /// </summary>
-    /// <param name="path"></param>
+    /// </summary>    
     private void CleanPluginCache() {
       FileStream fs = null;