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

Timestamp:

04/11/11 20:57:29 (13 years ago)

Author:

ascheibe

Message:

#1233

• fix pause/stop bug when serializing big experiments
• use proper newlines
• use GetPlugin(..) instead of GetPlugins()

Location:

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

Files:

• ConfigManager.cs (modified) (1 diff)
• Executor.cs (modified) (6 diffs)
• PluginCache.cs (modified) (1 diff)
• WcfService.cs (modified) (1 diff)

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

@@ -103 +103 @@
         foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
-          prog[e.JobId] = e.ExecutionTime;
+          //don't include jobs in hb's which are currently serializing
+          if (e.SendHeartbeatForExecutor) {
+            prog[e.JobId] = e.ExecutionTime;
+          }
         }
       }

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

@@ -38 +38 @@
     private Semaphore pauseStopSem = new Semaphore(0, 1);
 
+    public bool SendHeartbeatForExecutor { get; set; }
+
     public bool Aborted { get; set; }
+
+    public DateTime CreationTime { get; set; }
 
     private Exception currentException;
@@ -63 +67 @@
     }
 
-    public DateTime CreationTime { get; set; }
+    public Executor() {
+      SendHeartbeatForExecutor = true;
+    }
 
     /// <param name="serializedJob"></param>
@@ -90 +96 @@
 
     public void Pause() {
+      SendHeartbeatForExecutor = false;
       if (Job == null) {
         SlaveClientCom.Instance.ClientCom.LogMessage("Pausing job: Job is null");
@@ -108 +115 @@
 
     public void Stop() {
+      SendHeartbeatForExecutor = false;
       if (Job == null) {
         SlaveClientCom.Instance.ClientCom.LogMessage("Stopping job: Job is null");
@@ -181 +189 @@
 
     private void Job_JobFailed(object sender, EventArgs e) {
-      //TODO: get exception to client
       HeuristicLab.Common.EventArgs<Exception> ex = (HeuristicLab.Common.EventArgs<Exception>)e;
       currentException = ex.Value;
@@ -241 +248 @@
     }
 
-    public Executor() {
-    }
-
     public void Dispose() {
       if (Job != null)

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

@@ -142 +142 @@
         SlaveClientCom.Instance.ClientCom.LogMessage("Fetching plugins for job");
 
-        IEnumerable<Plugin> pluginDescriptions = WcfService.Instance.GetPlugins();
         List<Plugin> requiredPlugins = new List<Plugin>();
         foreach (Guid pluginId in myJob.PluginsNeededIds) {
-          Plugin pl = pluginDescriptions.FirstOrDefault(p => p.Id == pluginId);
-          if (pl != null)
-            requiredPlugins.Add(pl);
+          //TODO: rewrite, GetPlugin(..) should be the last thing to do after checking the local plugins
+          Plugin plugin = WcfService.Instance.GetPlugin(pluginId);
+          if (plugin != null)
+            requiredPlugins.Add(plugin);
         }
 

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

@@ -112 +112 @@
 
     #region Plugin Methods
+
+    public Plugin GetPlugin(Guid id) {
+      return CallHiveService(s => s.GetPlugin(id));
+    }
+
     public IEnumerable<Plugin> GetPlugins() {
       return CallHiveService(s => s.GetPlugins());