Changeset 4936

Timestamp:

11/25/10 15:24:35 (13 years ago)

Author:

cneumuel

Message:

#1260

• seperated plugin folder on slaves into PluginCache and PluginTemp, so that the PluginManager does not load the plugins from the temporary folders (which caused rare concurrency issues)

Location:

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3

Files:

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

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

@@ -369 +369 @@
 
           Logger.Debug("Plugins fetched for job " + e.Result.Obj.Id);
-          String pluginDir = Path.Combine(PluginCache.Instance.PluginRepositoryDir, e.Result.Obj.Id.ToString());
+          String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, e.Result.Obj.Id.ToString());
 
           AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(pluginDir);

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs

@@ -37 +37 @@
     private static PluginCache instance = null;
 
-    public string PluginRepositoryDir { get; set; }
+    public string PluginCacheDir { get; set; }
+    public string PluginTempBaseDir { get; set; }
 
     private List<PluginDescription> cachedPlugins = new List<PluginDescription>();
@@ -52 +53 @@
 
     public PluginCache() {
-      PluginRepositoryDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins");
+      PluginCacheDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginCache");
+      PluginTempBaseDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginTemp");
       
-      this.pm = new PluginManager(PluginRepositoryDir);
+      this.pm = new PluginManager(PluginCacheDir);
       DoUpdateRun();
     }
 
     private void DoUpdateRun() {
-      if (!Directory.Exists(PluginRepositoryDir)) {
-        Directory.CreateDirectory(PluginRepositoryDir);
+      if (!Directory.Exists(PluginCacheDir)) {
+        Directory.CreateDirectory(PluginCacheDir);
       }
       pm.DiscoverAndCheckPlugins();
@@ -68 +70 @@
     [MethodImpl(MethodImplOptions.Synchronized)]
     public void CopyPluginsForJob(List<HivePluginInfoDto> requests, Guid jobId) {
-      String targetDir = Path.Combine(PluginRepositoryDir, jobId.ToString());
+      String targetDir = Path.Combine(PluginTempBaseDir, jobId.ToString());
 
       if (Directory.Exists(targetDir)) {
@@ -141 +143 @@
         foreach (HivePluginFile pf in updateablePlugin.PluginFiles) {
           Logger.Debug(string.Format("writing {0}", Path.GetFileName(pf.Name)));
-          File.WriteAllBytes(Path.Combine(PluginRepositoryDir, Path.GetFileName(pf.Name)), pf.BinaryFile);
+          File.WriteAllBytes(Path.Combine(PluginCacheDir, Path.GetFileName(pf.Name)), pf.BinaryFile);
         }
       }
@@ -150 +152 @@
       try {
         Logger.Debug("unloading...");
-        Directory.Delete(Path.Combine(PluginRepositoryDir, id.ToString()), true);
+        Directory.Delete(Path.Combine(PluginTempBaseDir, id.ToString()), true);
       }
       catch (Exception ex) {