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

Timestamp:

02/14/11 18:23:37 (14 years ago)

Author:

cneumuel

Message:

#1233

• removed GetConfigurationFile from service -> configuration is now submitted as a plugin with one file (the configuration file)
• resource ids are now checked before uploading a hive experiment, only valid resource names are accepted
• added SharpZipLib License to ConsoleClient project, so dependecies are satisfied

Location:

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

Files:

• Core.cs (modified) (2 diffs)
• PluginCache.cs (modified) (10 diffs)
• WcfService.cs (modified) (1 diff)

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

@@ -402 +402 @@
       String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString());
       bool pluginsPrepared = false;
+      string configFileName = string.Empty;
 
       try {
-        PluginCache.Instance.PreparePlugins(myJob, jobData);
+        PluginCache.Instance.PreparePlugins(myJob, out configFileName);
         ClientCom.LogMessage("Plugins fetched for job " + myJob.Id);
         pluginsPrepared = true;
@@ -414 +415 @@
       if (pluginsPrepared) {
         try {
-          AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, PluginCache.ConfigFileName));
+          AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
           appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           lock (engines) {

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

@@ -34 +34 @@
   public class PluginCache {
     private static object locker = new object();
-    public const string ConfigFileName = "Sandbox.config";
     private const string lastUsedFileName = "lastUsed.dat";
 
@@ -52 +51 @@
           instance = new PluginCache();
         return instance;
-      }
-    }
-
-    public string ConfigFilePath {
-      get {
-        return Path.Combine(PluginCacheDir, ConfigFileName);
       }
     }
@@ -83 +76 @@
 
       foreach (string dir in Directory.EnumerateDirectories(PluginCacheDir)) {
-        cachedPluginsGuids.Add(Guid.Parse(getFilenameFromPath(dir)));
+        cachedPluginsGuids.Add(Guid.Parse(getFilenameFromPath(dir))); // Todo: cleaner solution to getFilenameFromPath
       }
     }
 
     [MethodImpl(MethodImplOptions.Synchronized)]
-    public void CopyPluginsForJob(List<Plugin> requests, Guid jobId) {
+    public void CopyPluginsForJob(List<Plugin> requests, Guid jobId, out string configFileName) {
       lock (locker) {
+        configFileName = string.Empty;
         String targetDir = Path.Combine(PluginTempBaseDir, jobId.ToString());
 
@@ -97 +91 @@
         Directory.CreateDirectory(targetDir);
 
-
         foreach (Plugin requestedPlugin in requests) {
-          string curPath = Path.Combine(PluginCacheDir, requestedPlugin.Id.ToString());
-          if (Directory.Exists(curPath)) {
-            writeDateLastUsed(curPath);
-
-            foreach (string file in Directory.GetFiles(curPath)) {
-              string fn = getFilenameFromPath(file);
-              if (fn != lastUsedFileName)
-                File.Copy(file, Path.Combine(targetDir, fn));
-            }
-          }
-        }
-
-        // copy config file
-        File.Copy(ConfigFilePath, Path.Combine(targetDir, ConfigFileName));
-
-        // copy files from PluginInfrastructure, which are not declared
+          var filePaths = GetPluginFilePaths(requestedPlugin.Id);
+          foreach (string filePath in filePaths) {
+            File.Copy(filePath, Path.Combine(targetDir, Path.GetFileName(filePath)));
+          }
+
+          if (requestedPlugin.Name == "Configuration") {
+            configFileName = Path.Combine(targetDir, Path.GetFileName(filePaths.SingleOrDefault())); // configuration plugin consists only of 1 file (usually the "HeuristicLab X.X.exe.config")
+          }
+        }
+
+        // copy files from PluginInfrastructure (which are not declared in any plugins)
         string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         CopyFile(baseDir, targetDir, "HeuristicLab.PluginInfrastructure-3.3.dll");
@@ -137 +125 @@
 
     [MethodImpl(MethodImplOptions.Synchronized)]
-    internal void PreparePlugins(Job myJob, JobData jobData) {
+    internal void PreparePlugins(Job myJob, out string configFileName) {
       lock (locker) {
         SlaveClientCom.Instance.ClientCom.LogMessage("Fetching plugins for job");
@@ -174 +162 @@
         localPlugins.AddRange(missingPlugins);
 
-        IEnumerable<PluginData> updateablePlugins = WcfService.Instance.GetPluginDatas(missingGuids);
-
-        foreach (PluginData updateablePlugin in updateablePlugins) {
-          string pluginDir = Path.Combine(PluginCacheDir, updateablePlugin.PluginId.ToString());
+        IEnumerable<PluginData> pluginDatas = WcfService.Instance.GetPluginDatas(missingGuids);
+
+        foreach (PluginData pluginData in pluginDatas) {
+          string pluginDir = Path.Combine(PluginCacheDir, pluginData.PluginId.ToString());
 
           //put all files belonging to a plugin in the same directory
@@ -183 +171 @@
             DirectoryInfo di = Directory.CreateDirectory(pluginDir);
           }
-          File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(updateablePlugin.FileName)), updateablePlugin.Data);
-        }
-
-        PluginData configFile = WcfService.Instance.GetConfigurationFile();
-        File.WriteAllBytes(ConfigFilePath, configFile.Data);
+          File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(pluginData.FileName)), pluginData.Data);
+        }
 
         DoUpdateRun();
-        CopyPluginsForJob(requiredPlugins, myJob.Id);
+        CopyPluginsForJob(requiredPlugins, myJob.Id, out configFileName);
+      }
+    }
+
+    /// <summary>
+    /// Returns a list of files which belong to a plugin from the plugincache
+    /// </summary>
+    private IEnumerable<string> GetPluginFilePaths(Guid pluginId) {
+      string pluginPath = Path.Combine(PluginCacheDir, pluginId.ToString());
+
+      if (Directory.Exists(pluginPath)) {
+        WriteDateLastUsed(pluginPath);
+        foreach (string filePath in Directory.GetFiles(pluginPath)) {
+          string fn = Path.GetFileName(filePath);
+          if (fn != lastUsedFileName)
+            yield return filePath;
+        }
       }
     }
@@ -198 +199 @@
     /// this can later be used to find plugins which are outdated
     /// </summary>    
-    private void writeDateLastUsed(string path) {
+    private void WriteDateLastUsed(string path) {
       FileStream fs = new FileStream(Path.Combine(path, lastUsedFileName), FileMode.Create);
       BinaryFormatter formatter = new BinaryFormatter();
@@ -218 +219 @@
     /// </summary>
     /// <param name="path"></param>
-    private void cleanPluginCache() {
+    private void CleanPluginCache() {
       FileStream fs = null;
       DateTime luDate;
@@ -274 +275 @@
         SlaveClientCom.Instance.ClientCom.LogMessage("failed while unloading " + id + " with exception " + ex);
       }
-      cleanPluginCache();
+      CleanPluginCache();
     }
   }

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

@@ -238 +238 @@
     }
 
-    public PluginData GetConfigurationFile() {
-      using (Disposable<IHiveService> service = GetSlaveService()) {
-        try {
-          PluginData msg = service.Obj.GetConfigurationFile();
-          return msg;
-        }
-        catch (Exception ex) {
-          HandleNetworkError(ex);
-          return null;
-        }
-      }
-    }
-
     private static Disposable<IHiveService> GetSlaveService() {
       return ServiceLocator.Instance.GetService("hiveslave", "hiveslave");