Changeset 6452 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Timestamp:

06/20/11 14:16:53 (13 years ago)

Author:

cneumuel

Message:

#1233

• renamed UptimeCalendar and Appointment to Downtime
• added service methods to delete plugins and get plugin by hash
• made reverted TransactionManager change, made it non-static and added interface
• moved magic numbers to application settings

Location:

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

Files:

• HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HiveClient.cs (modified) (3 diffs)
• ServiceClients/Appointment.cs (deleted)
• ServiceClients/Downtime.cs (added)
• ServiceClients/HiveServiceClient.cs (modified) (6 diffs)
• Util/PluginUtil.cs (modified) (2 diffs)

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

@@ -120 +120 @@
     <None Include="app_services.config" />
     <None Include="app.config" />
-    <None Include="ClassDiagram2.cd" />
+    <None Include="ClassDiagram.cd" />
     <None Include="HeuristicLabClientsHivePlugin.cs.frame" />
     <Compile Include="Exceptions\AddJobToHiveException.cs" />
@@ -151 +151 @@
     <Compile Include="Exceptions\ServiceClientFactoryException.cs" />
     <Compile Include="ScopeExtensions.cs" />
-    <Compile Include="ServiceClients\Appointment.cs" />
+    <Compile Include="ServiceClients\Downtime.cs" />
     <Compile Include="ServiceClients\HiveItemCollection.cs" />
     <Compile Include="ServiceClients\IHiveItem.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveClient.cs

@@ -192 +192 @@
     private Semaphore jobUploadSemaphore = new Semaphore(4, 4); // todo: take magic number into config
     private static object jobCountLocker = new object();
+    private static object pluginLocker = new object();
     private void UploadExperiment(RefreshableHiveExperiment refreshableHiveExperiment, CancellationToken cancellationToken) {
       try {
@@ -285 +286 @@
           jobCount[0]++;
         }
-        JobData jobData = null;
-        List<IPluginDescription> plugins = null;
-
-        TryAndRepeat(() => { // workaround for persistence bug (thread-safe access to bitmaps) - remove later
-          if (hiveJob.ItemJob.ComputeInParallel && (hiveJob.ItemJob.Item is Optimization.Experiment || hiveJob.ItemJob.Item is Optimization.BatchRun)) {
-            hiveJob.Job.IsParentJob = true;
-            hiveJob.Job.FinishWhenChildJobsFinished = true;
-            jobData = hiveJob.GetAsJobData(true, out plugins);
-          } else {
-            hiveJob.Job.IsParentJob = false;
-            hiveJob.Job.FinishWhenChildJobsFinished = false;
-            jobData = hiveJob.GetAsJobData(false, out plugins);
-          }
-        }, 30, "Could not serialize job");
+        JobData jobData;
+        List<IPluginDescription> plugins;
+
+        if (hiveJob.ItemJob.ComputeInParallel && (hiveJob.ItemJob.Item is Optimization.Experiment || hiveJob.ItemJob.Item is Optimization.BatchRun)) {
+          hiveJob.Job.IsParentJob = true;
+          hiveJob.Job.FinishWhenChildJobsFinished = true;
+          jobData = hiveJob.GetAsJobData(true, out plugins);
+        } else {
+          hiveJob.Job.IsParentJob = false;
+          hiveJob.Job.FinishWhenChildJobsFinished = false;
+          jobData = hiveJob.GetAsJobData(false, out plugins);
+        }
         cancellationToken.ThrowIfCancellationRequested();
 
         TryAndRepeat(() => {
           if (!cancellationToken.IsCancellationRequested) {
-            ServiceLocator.Instance.CallHiveService((s) => hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+            lock (pluginLocker) {
+              ServiceLocator.Instance.CallHiveService((s) => hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+            }
           }
         }, -1, "Failed to upload plugins");
@@ -333 +334 @@
             var arguments = (Tuple<HiveJob, HiveJob>)tuple;
             UploadJobWithChildren(progress, arguments.Item1, arguments.Item2, groups, jobCount, totalJobCount, configPluginId, hiveExperimentId, log, isPrivileged, cancellationToken);
-          }, new Tuple<HiveJob, HiveJob>(child, hiveJob ))
+          }, new Tuple<HiveJob, HiveJob>(child, hiveJob))
           .ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs

@@ -82 +82 @@
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.StateLog))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Appointment))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Downtime))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.PluginData))]
   public partial class HiveItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
@@ -938 +938 @@
       "nsfer")]
   [System.SerializableAttribute()]
-  public partial class Appointment : HeuristicLab.Clients.Hive.HiveItem {
+  public partial class Downtime : HeuristicLab.Clients.Hive.HiveItem {
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -1506 +1506 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddAppointment", ReplyAction = "http://tempuri.org/IHiveService/AddAppointmentResponse")]
-    System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
+    System.Guid AddAppointment(HeuristicLab.Clients.Hive.Downtime appointment);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteAppointment", ReplyAction = "http://tempuri.org/IHiveService/DeleteAppointmentResponse")]
@@ -1512 +1512 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateAppointment", ReplyAction = "http://tempuri.org/IHiveService/UpdateAppointmentResponse")]
-    void UpdateAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
+    void UpdateAppointment(HeuristicLab.Clients.Hive.Downtime appointment);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetScheduleForResource", ReplyAction = "http://tempuri.org/IHiveService/GetScheduleForResourceResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Appointment> GetScheduleForResource(System.Guid resourceId);
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Downtime> GetScheduleForResource(System.Guid resourceId);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddJob", ReplyAction = "http://tempuri.org/IHiveService/AddJobResponse")]
@@ -1694 +1694 @@
     }
 
-    public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment) {
+    public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Downtime appointment) {
       return base.Channel.AddAppointment(appointment);
     }
@@ -1702 +1702 @@
     }
 
-    public void UpdateAppointment(HeuristicLab.Clients.Hive.Appointment appointment) {
+    public void UpdateAppointment(HeuristicLab.Clients.Hive.Downtime appointment) {
       base.Channel.UpdateAppointment(appointment);
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Appointment> GetScheduleForResource(System.Guid resourceId) {
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Downtime> GetScheduleForResource(System.Guid resourceId) {
       return base.Channel.GetScheduleForResource(resourceId);
     }

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>
@@ -41 +40 @@
     /// <returns></returns>
     public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
-      lock (locker) {
-        var pluginIds = new List<Guid>();
-        Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
+      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));
+      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) {
-            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 {
-              pluginIds.Add(foundPlugin.Id);
+            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 {
             pluginIds.Add(foundPlugin.Id);
           }
+        } else {
+          pluginIds.Add(foundPlugin.Id);
         }
-        return pluginIds;
       }
+      return pluginIds;
     }