Changeset 6101 for branches

Timestamp:

05/02/11 19:07:24 (14 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

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Program.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/SlaveCommListener.cs (added)
• HeuristicLab.Clients.Hive.Slave.Tests/HeuristicLab.Clients.Hive.Slave.Tests-3.4.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Tests/SlaveCommListener.cs (deleted)
• HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs (modified) (1 diff)

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

@@ -58 +58 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SlaveCommListener.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HeuristicLab.Clients.Hive.Slave.Tests\HeuristicLab.Clients.Hive.Slave.Tests-3.4.csproj">
-      <Project>{C4CBD11E-1B83-464A-B0AD-0DC0FF7E57AA}</Project>
-      <Name>HeuristicLab.Clients.Hive.Slave.Tests-3.4</Name>
-    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Clients.Hive.Slave\3.4\HeuristicLab.Clients.Hive.Slave-3.4.csproj">
       <Project>{989FE92B-484E-41EE-87E2-6A24AF0381D8}</Project>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/Program.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
-using HeuristicLab.Clients.Hive.SlaveCore.Tests;
+
 
 

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

@@ -66 +66 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-2.5.0">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\ALGLIB-2.5.0.dll</HintPath>
-    </Reference>
     <Reference Include="ALGLIB-3.1.0">
       <HintPath>C:\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
@@ -74 +71 @@
     <Reference Include="Google.ProtocolBuffers-0.9.1">
       <HintPath>C:\Program Files\HeuristicLab 3.3\Google.ProtocolBuffers-0.9.1.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.ALGLIB-2.5.0">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-2.5.0.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.ALGLIB-3.1.0">
@@ -347 +341 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Mocks\MockServiceLocator.cs" />
-    <Compile Include="SlaveCommListener.cs" />
     <Compile Include="SlaveTest.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj">
+      <Project>{464D70B8-2D91-485C-B622-22E4A4891C68}</Project>
+      <Name>HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Clients.Hive.Slave\3.4\HeuristicLab.Clients.Hive.Slave-3.4.csproj">
       <Project>{989FE92B-484E-41EE-87E2-6A24AF0381D8}</Project>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Clients.Hive.SlaveCore.ConsoleClient;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 

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;