Changeset 16209 for trunk/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

Timestamp:

10/03/18 15:06:21 (6 years ago)

Author:

jzenisek

Message:

#2839:

• adapted job execution implementation at ProjectJobsView
• prohibited resource checking for non-admins

File:

• trunk/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs (modified) (11 diffs)

trunk/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

@@ -80 +80 @@
     }
 
+    private Dictionary<Guid, List<LightweightTask>> tasks;
+    public Dictionary<Guid, List<LightweightTask>> Tasks {
+      get { return tasks; }
+    }
+
     private Dictionary<Guid, HashSet<Guid>> projectAncestors;
     public Dictionary<Guid, HashSet<Guid>> ProjectAncestors {
@@ -145 +150 @@
         projectResourceAssignments = new ItemList<AssignedProjectResource>();
         jobs = new Dictionary<Guid, HiveItemCollection<RefreshableJob>>();
+        tasks = new Dictionary<Guid, List<LightweightTask>>();
         projectNames = new Dictionary<Guid, string>();
         resourceNames = new Dictionary<Guid, string>();
@@ -311 +317 @@
       var projectIds = new List<Guid>();
       jobs = new Dictionary<Guid, HiveItemCollection<RefreshableJob>>();
+      tasks = new Dictionary<Guid, List<LightweightTask>>();
 
       HiveServiceLocator.Instance.CallHiveService(service => {
@@ -329 +336 @@
     }
 
-    public static void LoadLightweightJob(RefreshableJob refreshableJob) {
+    public void LoadLightweightJob(RefreshableJob refreshableJob) {
       var job = refreshableJob.Job;
-      var tasks = HiveServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasksWithoutStateLog(job.Id));
-      if (tasks != null && tasks.Count > 0 && tasks.All(x => x.Id != Guid.Empty)) {
-        if (tasks.All(x =>
+      var lightweightTasks = HiveServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasksWithoutStateLog(job.Id));
+
+      if (tasks.ContainsKey(job.Id)) {
+        tasks[job.Id].Clear();
+        tasks[job.Id].AddRange(lightweightTasks);
+      } else {
+        tasks.Add(job.Id, new List<LightweightTask>(lightweightTasks));        
+      }
+
+      if (lightweightTasks != null && lightweightTasks.Count > 0 && lightweightTasks.All(x => x.Id != Guid.Empty)) {
+        if (lightweightTasks.All(x =>
           x.State == TaskState.Finished 
           || x.State == TaskState.Aborted 
@@ -340 +355 @@
           refreshableJob.RefreshAutomatically = false;
         } else if (
-          tasks
+          lightweightTasks
             .Where(x => x.ParentTaskId != null)
             .All(x =>
@@ -346 +361 @@
               || x.State != TaskState.Transferring
               || x.State != TaskState.Calculating)
-          && tasks
+          && lightweightTasks
              .Where(x => x.ParentTaskId != null)
              .Any(x => x.State == TaskState.Paused)) {
           refreshableJob.ExecutionState = ExecutionState.Paused;
           refreshableJob.RefreshAutomatically = false;
-        } else if (tasks.Any(x => x.State == TaskState.Calculating 
+        } else if (lightweightTasks.Any(x => x.State == TaskState.Calculating 
                                   || x.State == TaskState.Transferring 
                                   || x.State == TaskState.Waiting)) {
           refreshableJob.ExecutionState = ExecutionState.Started;
         }
+
+        refreshableJob.ExecutionTime = TimeSpan.FromMilliseconds(lightweightTasks.Sum(x => x.ExecutionTime.TotalMilliseconds));
       }
     }
@@ -451 +468 @@
     public static void ResumeJob(RefreshableJob refreshableJob) {
       HiveServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
-          if (task.Task.State == TaskState.Paused) {
-            service.RestartTask(task.Task.Id);
+        var tasks = service.GetLightweightJobTasksWithoutStateLog(refreshableJob.Id);
+        foreach (var task in tasks) {
+          if (task.State == TaskState.Paused) {
+            service.RestartTask(task.Id);
           }
         }
@@ -462 +480 @@
     public static void PauseJob(RefreshableJob refreshableJob) {
       HiveServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
-          if (task.Task.State != TaskState.Finished && task.Task.State != TaskState.Aborted && task.Task.State != TaskState.Failed)
-            service.PauseTask(task.Task.Id);
+        var tasks = service.GetLightweightJobTasksWithoutStateLog(refreshableJob.Id);
+        foreach (var task in tasks) {
+          if (task.State != TaskState.Finished && task.State != TaskState.Aborted && task.State != TaskState.Failed)
+            service.PauseTask(task.Id);
         }
       });
@@ -472 +491 @@
     public static void StopJob(RefreshableJob refreshableJob) {
       HiveServiceLocator.Instance.CallHiveService(service => {
-        foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
-          if (task.Task.State != TaskState.Finished && task.Task.State != TaskState.Aborted && task.Task.State != TaskState.Failed)
-            service.StopTask(task.Task.Id);
+        var tasks = service.GetLightweightJobTasksWithoutStateLog(refreshableJob.Id);
+        foreach (var task in tasks) {
+          if (task.State != TaskState.Finished && task.State != TaskState.Aborted && task.State != TaskState.Failed)
+            service.StopTask(task.Id);
         }
       });
@@ -481 +501 @@
 
     public static void RemoveJob(RefreshableJob refreshableJob) {
-      HiveServiceLocator.Instance.CallHiveService((s) => {
-        s.UpdateJobState(refreshableJob.Id, JobState.StatisticsPending);
+      HiveServiceLocator.Instance.CallHiveService((service) => {
+        service.UpdateJobState(refreshableJob.Id, JobState.StatisticsPending);
       });
     }
@@ -624 +644 @@
     }
 
+    public IEnumerable<Resource> GetAssignedResourcesForJob(Guid jobId) {
+      var assignedJobResource =  HiveServiceLocator.Instance.CallHiveService(service => service.GetAssignedResourcesForJob(jobId));
+      return Resources.Where(x => assignedJobResource.Select(y => y.ResourceId).Contains(x.Id));
+    }
+
     private bool IsAdmin() {
       return HiveRoles.CheckAdminUserPermissions();