Changeset 6444 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs

Timestamp:

06/19/11 23:21:21 (13 years ago)

Author:

cneumuel

Message:

#1233

• stability improvements for HiveExperiment and HiveEngine
• parallelized upload of jobs
• enabled cancellation of job upload
• reduced the amount of double-assignment of jobs by an additional check in HeartbeatManager
• tried to tackle the amount of deadlocks by automatically rerunning transactions
• some fixes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Util/PluginUtil.cs

@@ -30 +30 @@
 namespace HeuristicLab.Clients.Hive {
   public static class PluginUtil {
+    private static object locker = new object();
 
     /// <summary>
@@ -40 +41 @@
     /// <returns></returns>
     public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
-      var pluginIds = new List<Guid>();
-      Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
+      lock (locker) {
+        var pluginIds = new List<Guid>();
+        Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
 
-      foreach (var neededPlugin in checksumsNeededPlugins) {
-        Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Hash.SequenceEqual(neededPlugin.Value));
-        if (foundPlugin == null) {
-          foundPlugin = onlinePlugins.FirstOrDefault(p => {
-            if (p.Hash != null) {
-              return p.Hash.SequenceEqual(neededPlugin.Value);
+        foreach (var neededPlugin in checksumsNeededPlugins) {
+          Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Hash.SequenceEqual(neededPlugin.Value));
+          if (foundPlugin == null) {
+            foundPlugin = onlinePlugins.FirstOrDefault(p => {
+              if (p.Hash != null) {
+                return p.Hash.SequenceEqual(neededPlugin.Value);
+              } else {
+                return false;
+              }
+            });
+
+            if (foundPlugin == null) {
+              Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
+              List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
+              try {
+                p.Id = service.AddPlugin(p, pd);
+                alreadyUploadedPlugins.Add(p);
+                pluginIds.Add(p.Id);
+              }
+              catch (FaultException<PluginAlreadyExistsFault> fault) {
+                onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
+              }
             } else {
-              return false;
-            }
-          });
-
-          if (foundPlugin == null) {
-            Plugin p = CreatePlugin(neededPlugin.Key, neededPlugin.Value);
-            List<PluginData> pd = CreatePluginDatas(neededPlugin.Key);
-            try {
-              p.Id = service.AddPlugin(p, pd);
-              alreadyUploadedPlugins.Add(p);
-              pluginIds.Add(p.Id);
-            }
-            catch (FaultException<PluginAlreadyExistsFault> fault) {
-              onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
+              pluginIds.Add(foundPlugin.Id);
             }
           } else {
             pluginIds.Add(foundPlugin.Id);
           }
-        } else {
-          pluginIds.Add(foundPlugin.Id);
         }
+        return pluginIds;
       }
-      return pluginIds;
     }