Changeset 5000 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core

Timestamp:

11/30/10 15:58:33 (13 years ago)

Author:

cneumuel

Message:

#1260

• custom configuration file is now deployed on slaves
• made plugin distribution process more robust
• fixed bug: slave assemblies are required in each sandbox appdomain
• cleaned up some configuration elements in slave console client
• fixed wrong path for locally persisted jobs

Location:

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

Files:

• Facades/SlaveFacade.cs (modified) (1 diff)
• LifecycleManager.cs (modified) (4 diffs)
• SlaveCommunicator.cs (modified) (4 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

@@ -225 +225 @@
     }
 
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public ResponseObject<HivePluginFile> GetConfigurationFile() {
+      return slaveCommunicator.GetConfigurationFile();
+    }
+
     #endregion
   }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/LifecycleManager.cs

@@ -30 +30 @@
 namespace HeuristicLab.Hive.Server.Core {
   class LifecycleManager : ILifecycleManager {
+    private readonly string pluginDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "App_Data\\Plugins");
     private AutoResetEvent waitHandle;
     private Thread thread;
@@ -57 +58 @@
     }
 
+    private byte[] configurationFile;
+    public byte[] ConfigurationFile {
+      get {
+        if (configurationFile == null) {
+          configurationFile = File.ReadAllBytes(Path.Combine(pluginDir, "HeuristicLab 3.3.exe.config"));
+        }
+        return configurationFile;
+      }
+    }
+
     #region ILifecycleManager Members
 
@@ -69 +80 @@
 
     private void LoadPlugins() {
-      pm = new PluginManager(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "App_Data\\Plugins"));
+      pm = new PluginManager(pluginDir);
       pm.DiscoverAndCheckPlugins();
       pm.InitializeLifetimeService();
@@ -115 +126 @@
 
     #endregion
-
-
   }
 }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

@@ -571 +571 @@
         //jobStream.Close();
 
-        DaoLocator.JobDao.SetBinaryJobFile(result.Id, serializedJob.ToArray());
+        if (serializedJob.Count > 0) {
+          DaoLocator.JobDao.SetBinaryJobFile(result.Id, serializedJob.ToArray());
+        }
       }
       Logger.Info("END Job received for Storage:");
@@ -662 +664 @@
 
       job.SerializedJobData = result;
-
+      
       DaoLocator.JobDao.Update(job.JobInfo);
 
@@ -760 +762 @@
           pd.Version.Major == pluginInfo.Version.Major &&
           pd.Version.Minor == pluginInfo.Version.Minor &&
-          pd.Version.Revision >= pluginInfo.Version.Revision &&
-          pd.Version.MinorRevision >= pluginInfo.Version.MinorRevision).SingleOrDefault();
+          pd.Version.Build >= pluginInfo.Version.Build).SingleOrDefault(); // ignore revision here, otherwise each client who uses a more recent trunk-build than the server-build will not be able to execute the job
         if (ipd != null) {
           response.List.Add(ConvertPluginDescriptorToDto(ipd));
@@ -788 +789 @@
     }
 
+    public ResponseObject<HivePluginFile> GetConfigurationFile() {
+      var response = new ResponseObject<HivePluginFile>();
+      response.Obj = new HivePluginFile(lifecycleManager.ConfigurationFile, "Sandbox.config");
+      return response;
+    }
+
     #endregion
   }