Changeset 12931 for branches/crossvalidation-2434/HeuristicLab.Clients.Hive/3.3

Timestamp:

09/02/15 13:16:18 (9 years ago)

Author:

gkronber

Message:

#2434 merged r12878:12927 from trunk to branch (hive changes)

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (8 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs (modified) (1 diff)

branches/crossvalidation-2434/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -68 +68 @@
       set { alreadyUploadedPlugins = value; }
     }
-
-    private bool isAllowedPrivileged;
-    public bool IsAllowedPrivileged {
-      get { return isAllowedPrivileged; }
-      set { isAllowedPrivileged = value; }
-    }
     #endregion
 
@@ -99 +93 @@
 
       try {
-        IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
-
         jobs = new HiveItemCollection<RefreshableJob>();
         var jobsLoaded = HiveServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
@@ -275 +267 @@
         refreshableJob.Progress.Status = "Uploading Job...";
         refreshableJob.Job.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job));
-        bool isPrivileged = refreshableJob.Job.IsPrivileged;
         refreshableJob.Job = HiveServiceLocator.Instance.CallHiveService((s) => s.GetJob(refreshableJob.Job.Id)); // update owner and permissions
-        refreshableJob.Job.IsPrivileged = isPrivileged;
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -298 +288 @@
         foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
           var task = TS.Task.Factory.StartNew((hj) => {
-            UploadTaskWithChildren(refreshableJob.Progress, (HiveTask)hj, null, resourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, refreshableJob.Job.IsPrivileged, cancellationToken);
+            UploadTaskWithChildren(refreshableJob.Progress, (HiveTask)hj, null, resourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, cancellationToken);
           }, hiveTask);
           task.ContinueWith((x) => refreshableJob.Log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted);
@@ -343 +333 @@
     /// </summary>
     /// <param name="parentHiveTask">shall be null if its the root task</param>
-    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
+    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, CancellationToken cancellationToken) {
       taskUploadSemaphore.WaitOne();
       bool semaphoreReleased = false;
@@ -375 +365 @@
         hiveTask.Task.PluginsNeededIds.Add(configPluginId);
         hiveTask.Task.JobId = jobId;
-        hiveTask.Task.IsPrivileged = isPrivileged;
 
         log.LogMessage(string.Format("Uploading task ({0} kb, {1} objects)", taskData.Data.Count() / 1024, hiveTask.ItemTask.GetObjectGraphObjects().Count()));
@@ -398 +387 @@
           var task = TS.Task.Factory.StartNew((tuple) => {
             var arguments = (Tuple<HiveTask, HiveTask>)tuple;
-            UploadTaskWithChildren(progress, arguments.Item1, arguments.Item2, groups, taskCount, totalJobCount, configPluginId, jobId, log, isPrivileged, cancellationToken);
+            UploadTaskWithChildren(progress, arguments.Item1, arguments.Item2, groups, taskCount, totalJobCount, configPluginId, jobId, log, cancellationToken);
           }, new Tuple<HiveTask, HiveTask>(child, hiveTask));
           task.ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted);
@@ -442 +431 @@
         IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results;
         var parents = allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue);
-        refreshableJob.Job.IsPrivileged = allHiveTasks.Any(x => x.Value.Task.IsPrivileged);
 
         refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";

branches/crossvalidation-2434/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

@@ -351 +351 @@
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private bool IsPrivilegedField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Guid JobIdField;
         
@@ -415 +412 @@
                     this.IsParentTaskField = value;
                     this.RaisePropertyChanged("IsParentTask");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public bool IsPrivileged
-        {
-            get
-            {
-                return this.IsPrivilegedField;
-            }
-            set
-            {
-                if ((this.IsPrivilegedField.Equals(value) != true))
-                {
-                    this.IsPrivilegedField = value;
-                    this.RaisePropertyChanged("IsPrivileged");
                 }
             }
@@ -2553 +2533 @@
         System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetJobPermissions(System.Guid jobId);
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/IsAllowedPrivileged", ReplyAction="http://tempuri.org/IHiveService/IsAllowedPrivilegedResponse")]
-        bool IsAllowedPrivileged();
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/Hello", ReplyAction="http://tempuri.org/IHiveService/HelloResponse")]
         void Hello(HeuristicLab.Clients.Hive.Slave slave);
@@ -2882 +2859 @@
         }
         
-        public bool IsAllowedPrivileged()
-        {
-            return base.Channel.IsAllowedPrivileged();
-        }
-        
         public void Hello(HeuristicLab.Clients.Hive.Slave slave)
         {

branches/crossvalidation-2434/HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs

@@ -27 +27 @@
   public partial class Job : IDeepCloneable, IContent {
 
-    private bool isPrivileged;
-    public bool IsPrivileged {
-      get { return isPrivileged; }
-      set { isPrivileged = value; }
-    }
-
     #region Constructors and Cloning
     public Job() {
@@ -48 +42 @@
       this.Description = original.Description;
       this.Id = original.Id;
-      this.IsPrivileged = original.IsPrivileged;
       this.Permission = original.Permission;
     }

branches/crossvalidation-2434/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

@@ -43 +43 @@
       this.FinishWhenChildJobsFinished = original.FinishWhenChildJobsFinished;
       this.JobId = original.JobId;
-      this.IsPrivileged = original.IsPrivileged;
     }