Changeset 4269

Timestamp:

08/20/10 09:54:05 (14 years ago)

Author:

cneumuel

Message:

fixed invalid plugin-directory (#1159)

Location:

branches/3.3-HiveMigration

Files:

• sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs (modified) (1 diff)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (8 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Heartbeat.cs (deleted)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs (modified) (7 diffs)
• tools/cleanHiveDatabase.sql (modified) (1 diff)
• tools/prepareHiveDatabase.sql (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobDataFetcher.cs

@@ -79 +79 @@
 
     private void DoUpdateRun() {
-      // [chn] Exception occured here: PollStates enumeration changed!
-      // todo: make access to PollStates thread-safe!
-      // * added lock on locker -> didn't help
-      // * made public property PollStates an IEnumerable to be immutable -> didn't help
-      // * using for loop
-
       JobState[] pollStatesCopy = PollStates.ToArray();
       for (int i = 0; i < pollStatesCopy.Length; i++) {

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

@@ -60 +60 @@
 
     private WcfService wcfService;
-    private Heartbeat beat;
+    private HeartbeatManager beat;
 
     /// <summary>
@@ -90 +90 @@
 
       //Initialize the heartbeat
-      beat = new Heartbeat { Interval = new TimeSpan(0, 0, 10) };
+      beat = new HeartbeatManager { Interval = new TimeSpan(0, 0, 10) };
       beat.StartHeartbeat();
 
@@ -197 +197 @@
           kvp.Value.RequestSnapshot();
         }
-
       }
     }
@@ -293 +292 @@
         bool sandboxed = false;
         Logger.Debug("Fetching plugins for job " + e.Result.Obj.Id);
-
-        PluginCache.Instance.PreparePlugins(e.Result.Obj.PluginsNeeded);
-
-        PluginCache.Instance.CopyPluginsForJob(e.Result.Obj.PluginsNeeded, e.Result.Obj.Id);
-
-        //        foreach (CachedHivePluginInfoDto plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
-        //        files.AddRange(plugininfo.PluginFiles);
-        Logger.Debug("Plugins fetched for job " + e.Result.Obj.Id);
         try {
-          String pluginDir = Path.Combine(PluginCache.PLUGIN_REPO, e.Result.Obj.Id.ToString());
+
+          PluginCache.Instance.PreparePlugins(e.Result.Obj.PluginsNeeded);
+          PluginCache.Instance.CopyPluginsForJob(e.Result.Obj.PluginsNeeded, e.Result.Obj.Id);
+
+          //        foreach (CachedHivePluginInfoDto plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
+          //        files.AddRange(plugininfo.PluginFiles);
+          Logger.Debug("Plugins fetched for job " + e.Result.Obj.Id);
+          String pluginDir = Path.Combine(PluginCache.Instance.PluginRepositoryDir, e.Result.Obj.Id.ToString());
 
           AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(pluginDir, null);
@@ -323 +321 @@
             }
           }
+          beat.InterruptHeartBeatThread();
         }
         catch (Exception exception) {
@@ -348 +347 @@
         SlaveStatusInfo.JobsProcessed++;
         Logger.Info("Increased ProcessedJobs to:" + SlaveStatusInfo.JobsProcessed);
+        beat.InterruptHeartBeatThread();
       } else {
         Logger.Error("Sending of job " + e.Result.JobId + " failed, job has been wasted. Message: " + e.Result.StatusMessage);
@@ -395 +395 @@
       //a result within the next few heartbeats      
       //if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline()) {
-        Logger.Info("CalendarAvailable is " + UptimeManager.Instance.CalendarAvailable + " and IsOnline is: " + UptimeManager.Instance.IsAllowedToCalculate());
-        Logger.Info("Setting client online");
-        wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
-        JobStorageManager.CheckAndSubmitJobsFromDisc();
-        CurrentlyFetching = false;
+      Logger.Info("CalendarAvailable is " + UptimeManager.Instance.CalendarAvailable + " and IsOnline is: " + UptimeManager.Instance.IsAllowedToCalculate());
+      Logger.Info("Setting client online");
+      wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
+      JobStorageManager.CheckAndSubmitJobsFromDisc();
+      CurrentlyFetching = false;
       //}
     }
@@ -417 +417 @@
         wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
       }
+      beat.InterruptHeartBeatThread();
     }
 

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

@@ -9 +9 @@
 using HeuristicLab.PluginInfrastructure.Manager;
 using HeuristicLab.Tracing;
+using System.Reflection;
 
 namespace HeuristicLab.Hive.Slave.Core {
@@ -15 +16 @@
     private static PluginCache instance = null;
 
-    public const string PLUGIN_REPO = @"plugins\";
+    public string PluginRepositoryDir { get; set; }
 
     private List<PluginDescription> cachedPlugins = new List<PluginDescription>();
 
-    private PluginManager pm = new PluginManager(PLUGIN_REPO);
+    private PluginManager pm;
 
     public static PluginCache Instance {
@@ -28 +29 @@
       }
     }
+
     public PluginCache() {
+      PluginRepositoryDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "plugins");
+      
+      this.pm = new PluginManager(PluginRepositoryDir);
       DoUpdateRun();
     }
 
     private void DoUpdateRun() {
+      if (!Directory.Exists(PluginRepositoryDir)) {
+        Directory.CreateDirectory(PluginRepositoryDir);
+      }
       pm.DiscoverAndCheckPlugins();
       cachedPlugins = new List<PluginDescription>(pm.Plugins);
     }
 
-
     [MethodImpl(MethodImplOptions.Synchronized)]
     public bool CopyPluginsForJob(List<HivePluginInfoDto> requests, Guid jobId) {
-
-      String targetDir = PLUGIN_REPO + jobId.ToString() + "\\";
+      String targetDir = Path.Combine(PluginRepositoryDir, jobId.ToString());
 
       if (Directory.Exists(targetDir)) {
@@ -50 +56 @@
 
       foreach (HivePluginInfoDto requestedPlugin in requests) {
-        PluginDescription pd =
-          cachedPlugins.Where(
-            cp =>
-            cp.Name == requestedPlugin.Name &&
-            cp.Version.Major == requestedPlugin.Version.Major &&
-            cp.Version.Minor == requestedPlugin.Version.Minor &&
-            cp.Version.Revision >= requestedPlugin.Version.Revision).
-            SingleOrDefault();
+        PluginDescription pd = cachedPlugins.Where(cp =>
+          cp.Name == requestedPlugin.Name &&
+          cp.Version.Major == requestedPlugin.Version.Major &&
+          cp.Version.Minor == requestedPlugin.Version.Minor &&
+          cp.Version.Revision >= requestedPlugin.Version.Revision).
+          SingleOrDefault();
         if (pd == null) {
           return false;
@@ -63 +67 @@
 
         foreach (IPluginFile ipf in pd.Files) {
-          File.Copy(ipf.Name, targetDir + ipf.Name.Split('\\').Last());
+          string x = targetDir + ipf.Name.Split('\\').Last();
+          string y = Path.Combine(targetDir, Path.GetFileName(ipf.Name));
+
+          //File.Copy(ipf.Name, targetDir + ipf.Name.Split('\\').Last());
+          File.Copy(ipf.Name, Path.Combine(targetDir, Path.GetFileName(ipf.Name)));
         }
       }
@@ -113 +121 @@
         Logger.Debug("creating new files");
         foreach (HivePluginFile pf in updateablePlugin.PluginFiles) {
-          File.WriteAllBytes(PLUGIN_REPO + pf.Name.Split('\\').Last(), pf.BinaryFile);
+          string x = PluginRepositoryDir + pf.Name.Split('\\').Last();
+          string y = Path.Combine(PluginRepositoryDir, Path.GetFileName(pf.Name));
+          File.WriteAllBytes(Path.Combine(PluginRepositoryDir, Path.GetFileName(pf.Name)), pf.BinaryFile);
         }
 
@@ -124 +134 @@
       try {
         Logger.Debug("unloading...");
-        Directory.Delete(Path.Combine(PLUGIN_REPO, id.ToString()), true);
-      } catch (Exception ex) {
+        Directory.Delete(Path.Combine(PluginRepositoryDir, id.ToString()), true);
+      }
+      catch (Exception ex) {
         Logger.Debug("failed while unloading " + id + " with exception " + ex);
       }

branches/3.3-HiveMigration/tools/cleanHiveDatabase.sql

@@ -4 +4 @@
 DELETE FROM [HeuristicLab.Hive].[dbo].UptimeStatistics
 DELETE FROM [HeuristicLab.Hive].[dbo].UptimeCalendar
-DELETE FROM [HeuristicLab.Hive].[dbo].ClientConfig
-DELETE FROM [HeuristicLab.Hive].[dbo].ClientGroup_Resource
+DELETE FROM [HeuristicLab.Hive].[dbo].SlaveConfig
+DELETE FROM [HeuristicLab.Hive].[dbo].SlaveGroup_Resource
 DELETE FROM [HeuristicLab.Hive].[dbo].[Resource]
 DELETE FROM [HeuristicLab.Hive].[dbo].Job

branches/3.3-HiveMigration/tools/prepareHiveDatabase.sql

@@ -6 +6 @@
 ALTER TABLE dbo.AssignedResources ALTER COLUMN AssignedRessourcesId DROP ROWGUIDCOL;
 ALTER TABLE dbo.Job ALTER COLUMN JobId DROP ROWGUIDCOL;
-ALTER TABLE dbo.ClientConfig ALTER COLUMN ClientConfigId DROP ROWGUIDCOL;
-ALTER TABLE dbo.ClientGroup_Resource ALTER COLUMN ClientGroup_RessourceId DROP ROWGUIDCOL;
+ALTER TABLE dbo.SlaveConfig ALTER COLUMN SlaveConfigId DROP ROWGUIDCOL;
+ALTER TABLE dbo.SlaveGroup_Resource ALTER COLUMN SlaveGroup_RessourceId DROP ROWGUIDCOL;
 ALTER TABLE dbo.PluginInfo ALTER COLUMN PluginId DROP ROWGUIDCOL;
 ALTER TABLE dbo.Project ALTER COLUMN ProjectId DROP ROWGUIDCOL;
@@ -17 +17 @@
 ALTER TABLE dbo.AssignedResources DROP CONSTRAINT [DF_AssignedResources_AssignedRessourcesId];
 ALTER TABLE dbo.Job DROP CONSTRAINT [DF_Job_JobId];
-ALTER TABLE dbo.ClientConfig DROP CONSTRAINT [DF_ClientConfig_ClientConfigId];
-ALTER TABLE dbo.ClientGroup_Resource DROP CONSTRAINT [DF_ClientGroup_ResourceClientGroup_RessourceId];
+ALTER TABLE dbo.SlaveConfig DROP CONSTRAINT [DF_SlaveConfig_SlaveConfigId];
+ALTER TABLE dbo.SlaveGroup_Resource DROP CONSTRAINT [DF_SlaveGroup_ResourceSlaveGroup_RessourceId];
 ALTER TABLE dbo.PluginInfo DROP CONSTRAINT [DF_PluginInfo_PluginId];
 ALTER TABLE dbo.Project DROP CONSTRAINT [DF_Project_ProjectId];
@@ -34 +34 @@
 ALTER TABLE dbo.Job WITH NOCHECK ADD CONSTRAINT [DF_Job_JobId] DEFAULT (newid()) FOR JobId;
 
-ALTER TABLE dbo.ClientConfig ALTER COLUMN ClientConfigId ADD ROWGUIDCOL;
-ALTER TABLE dbo.ClientConfig WITH NOCHECK ADD CONSTRAINT [DF_ClientConfig_ClientConfigId] DEFAULT (newid()) FOR ClientConfigId;
+ALTER TABLE dbo.SlaveConfig ALTER COLUMN SlaveConfigId ADD ROWGUIDCOL;
+ALTER TABLE dbo.SlaveConfig WITH NOCHECK ADD CONSTRAINT [DF_SlaveConfig_SlaveConfigId] DEFAULT (newid()) FOR SlaveConfigId;
 
-ALTER TABLE dbo.ClientGroup_Resource ALTER COLUMN ClientGroup_RessourceId ADD ROWGUIDCOL;
-ALTER TABLE dbo.ClientGroup_Resource WITH NOCHECK ADD CONSTRAINT [DF_ClientGroup_Resource_ClientGroup_RessourceId] DEFAULT (newid()) FOR ClientGroup_RessourceId;
+ALTER TABLE dbo.SlaveGroup_Resource ALTER COLUMN SlaveGroup_RessourceId ADD ROWGUIDCOL;
+ALTER TABLE dbo.SlaveGroup_Resource WITH NOCHECK ADD CONSTRAINT [DF_SlaveGroup_Resource_SlaveGroup_RessourceId] DEFAULT (newid()) FOR SlaveGroup_RessourceId;
 
 ALTER TABLE dbo.PluginInfo ALTER COLUMN PluginId ADD ROWGUIDCOL;