Changeset 6107

Timestamp:

05/03/11 15:45:04 (14 years ago)

Author:

ascheibe

Message:

#1233

• simplify PreparePlugins
• send more exceptions to ExperimentManager

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -78 +78 @@
       }
       catch (Exception) {
-        OnMessageLogged("Couldn't connect to Slave core. Is it possible that the Slave Core isn't running?" + Environment.NewLine);
+        OnMessageLogged("Couldn't connect to Slave core. Is it possible that the core isn't running?");
         return false;
       }

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

@@ -177 +177 @@
               // handle exception of task
               clientCom.LogMessage(t.Exception.ToString());
+              wcfService.UpdateJobState(container.JobId, JobState.Failed, t.Exception.ToString());
+              SlaveStatusInfo.JobsAborted++;
             }, TaskContinuationOptions.OnlyOnFaulted);
             break;
@@ -474 +476 @@
         catch (Exception exception) {
           clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
+          wcfService.UpdateJobState(myJob.Id, JobState.Failed, exception.ToString());
+          SlaveStatusInfo.JobsAborted++;
+
           lock (engines) {
             if (jobs.ContainsKey(myJob.Id)) {
@@ -501 +506 @@
             clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id);
             clientCom.LogMessage("Error thrown is: " + exception.ToString());
+
+            if (engines.ContainsKey(myJob.Id) && engines[myJob.Id].CurrentException != string.Empty) {
+              wcfService.UpdateJobState(myJob.Id, JobState.Failed, engines[myJob.Id].CurrentException);
+            } else {
+              wcfService.UpdateJobState(myJob.Id, JobState.Failed, exception.ToString());
+            }
+            SlaveStatusInfo.JobsAborted++;
+
             KillAppDomain(myJob.Id);
           }

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

@@ -60 +60 @@
     }
 
+    /// <summary>
+    /// Returns the last directory of a path
+    /// </summary>    
     private string GetFilenameFromPath(string path) {
       string[] dirParts = path.Split(Path.DirectorySeparatorChar);
@@ -72 +75 @@
       SafelyCreateDirectory(PluginCacheDir);
       foreach (string dir in Directory.EnumerateDirectories(PluginCacheDir)) {
-        cachedPluginsGuids.Add(Guid.Parse(GetFilenameFromPath(dir))); // Todo: cleaner solution to getFilenameFromPath
+        cachedPluginsGuids.Add(Guid.Parse(GetFilenameFromPath(dir)));
       }
     }
@@ -137 +140 @@
     }
 
-    [MethodImpl(MethodImplOptions.Synchronized)]
+    /// <summary>
+    /// Updates the plugin cache with missing plugins and 
+    /// then copies the required plugins for the job.
+    /// </summary>        
     internal void PreparePlugins(Job myJob, out string configFileName) {
       lock (locker) {
-        SlaveClientCom.Instance.ClientCom.LogMessage("Fetching plugins for job");
-
-        List<Plugin> requiredPlugins = new List<Plugin>();
+        SlaveClientCom.Instance.ClientCom.LogMessage("Fetching plugins for job " + myJob.Id);
+
+        List<Guid> missingGuids = new List<Guid>();
+        List<Plugin> neededPlugins = new List<Plugin>();
         foreach (Guid pluginId in myJob.PluginsNeededIds) {
-          //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);
-        }
-
-        List<Plugin> localPlugins = new List<Plugin>();
-        List<Plugin> missingPlugins = new List<Plugin>();
-        List<Guid> missingGuids = new List<Guid>();
-        bool found = false;
-
-        foreach (Plugin info in requiredPlugins) {
-          foreach (Guid cachedPlugin in cachedPluginsGuids) {
-            if (info.Id == cachedPlugin) {
-              localPlugins.Add(new Plugin() { Id = cachedPlugin, Name = info.Name, Version = info.Version });
-              found = true;
-
-              break;
-            }
-          }
-          if (!found) {
-            SlaveClientCom.Instance.ClientCom.LogMessage("Plugin NOT found " + info.Name + ", " + info.Version);
-            missingPlugins.Add(info);
-            missingGuids.Add(info.Id);
-          }
-          found = false;
-        }
-
-        SlaveClientCom.Instance.ClientCom.LogMessage("First run - Update the plugins in the cache");
-        localPlugins.AddRange(missingPlugins);
+          if (plugin != null) {
+            neededPlugins.Add(plugin);
+          }
+
+          if (!cachedPluginsGuids.Contains(pluginId)) {
+            missingGuids.Add(pluginId);
+          }
+        }
 
         IEnumerable<PluginData> pluginDatas = WcfService.Instance.GetPluginDatas(missingGuids);
@@ -187 +173 @@
 
           DoUpdateRun();
-          CopyPluginsForJob(requiredPlugins, myJob.Id, out configFileName);
+          CopyPluginsForJob(neededPlugins, myJob.Id, out configFileName);
         } else {
           configFileName = "";
         }
+
+        SlaveClientCom.Instance.ClientCom.LogMessage("Fetched " + missingGuids.Count + " plugins for job " + myJob.Id);
       }
     }