Changeset 15630 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

Timestamp:

01/18/18 15:08:25 (6 years ago)

Author:

jzenisek

Message:

#2839

• updated Heartbeat processing (regarding: checking against AssignedJobResources and handling of the updated Job deletion routine)
• updated Job deletion routine(still in progress at GenerateStatistics)

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (9 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -144 +144 @@
         }
       } else {
-        if (item is Job)
-          HiveServiceLocator.Instance.CallHiveService(s => s.UpdateJob((Job)item));
+        if (item is Job) {
+          var job = (Job)item;
+          HiveServiceLocator.Instance.CallHiveService(s => s.UpdateJob(job, job.ResourceIds));
+        }
         if (item is Project)
           HiveServiceLocator.Instance.CallHiveService(s => s.UpdateProject((Project)item));
@@ -173 +175 @@
 
       if (item is Job)
-        HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.UpdateJobState(item.Id, JobState.StatisticsPending));
       if (item is RefreshableJob) {
         RefreshableJob job = (RefreshableJob)item;
@@ -179 +181 @@
           job.StopResultPolling();
         }
-        HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(item.Id));
+        HiveServiceLocator.Instance.CallHiveService(s => s.UpdateJobState(item.Id, JobState.StatisticsPending));
       }
       if (item is JobPermission) {
@@ -262 +264 @@
         // upload Job
         refreshableJob.Progress.Status = "Uploading Job...";
-        refreshableJob.Job.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job));
+        refreshableJob.Job.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job, refreshableJob.Job.ResourceIds));
         refreshableJob.Job = HiveServiceLocator.Instance.CallHiveService((s) => s.GetJob(refreshableJob.Job.Id)); // update owner and permissions
         cancellationToken.ThrowIfCancellationRequested();
@@ -284 +286 @@
         foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
           var task = TS.Task.Factory.StartNew((hj) => {
-            UploadTaskWithChildren(refreshableJob.Progress, (HiveTask)hj, null, refreshableJob.Job.ResourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, cancellationToken);
+            UploadTaskWithChildren(refreshableJob.Progress, (HiveTask)hj, null, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, cancellationToken);
           }, hiveTask);
           task.ContinueWith((x) => refreshableJob.Log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted);
@@ -329 +331 @@
     /// </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, CancellationToken cancellationToken) {
+    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveTask, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, CancellationToken cancellationToken) {
       taskUploadSemaphore.WaitOne();
       bool semaphoreReleased = false;
@@ -368 +370 @@
               hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveTask.Task.Id, hiveTask.Task, taskData));
             } else {
-              hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData, groups.ToList()));
+              hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData));
             }
           }
@@ -383 +385 @@
           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, cancellationToken);
+            UploadTaskWithChildren(progress, arguments.Item1, arguments.Item2, taskCount, totalJobCount, configPluginId, jobId, log, cancellationToken);
           }, new Tuple<HiveTask, HiveTask>(child, hiveTask));
           task.ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted);
@@ -390 +392 @@
         taskUploadSemaphore.Release(); semaphoreReleased = true; // the semaphore has to be release before waitall!
         TS.Task.WaitAll(tasks.ToArray());
-      }
-      finally {
+      } finally {
         if (!semaphoreReleased) taskUploadSemaphore.Release();
       }
     }
+
+
+    /// <summary>
+    /// Uploads the given task and all its child-jobs while setting the proper parentJobId values for the childs
+    /// </summary>
+    /// <param name="parentHiveTask">shall be null if its the root task</param>
+    //private void UploadTaskWithChildren_Old(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;
+    //  try {
+    //    cancellationToken.ThrowIfCancellationRequested();
+    //    lock (jobCountLocker) {
+    //      taskCount[0]++;
+    //    }
+    //    TaskData taskData;
+    //    List<IPluginDescription> plugins;
+
+    //    if (hiveTask.ItemTask.ComputeInParallel) {
+    //      hiveTask.Task.IsParentTask = true;
+    //      hiveTask.Task.FinishWhenChildJobsFinished = true;
+    //      taskData = hiveTask.GetAsTaskData(true, out plugins);
+    //    } else {
+    //      hiveTask.Task.IsParentTask = false;
+    //      hiveTask.Task.FinishWhenChildJobsFinished = false;
+    //      taskData = hiveTask.GetAsTaskData(false, out plugins);
+    //    }
+    //    cancellationToken.ThrowIfCancellationRequested();
+
+    //    TryAndRepeat(() => {
+    //      if (!cancellationToken.IsCancellationRequested) {
+    //        lock (pluginLocker) {
+    //          HiveServiceLocator.Instance.CallHiveService((s) => hiveTask.Task.PluginsNeededIds = PluginUtil.GetPluginDependencies(s, this.onlinePlugins, this.alreadyUploadedPlugins, plugins));
+    //        }
+    //      }
+    //    }, Settings.Default.MaxRepeatServiceCalls, "Failed to upload plugins");
+    //    cancellationToken.ThrowIfCancellationRequested();
+    //    hiveTask.Task.PluginsNeededIds.Add(configPluginId);
+    //    hiveTask.Task.JobId = jobId;
+
+    //    log.LogMessage(string.Format("Uploading task ({0} kb, {1} objects)", taskData.Data.Count() / 1024, hiveTask.ItemTask.GetObjectGraphObjects().Count()));
+    //    TryAndRepeat(() => {
+    //      if (!cancellationToken.IsCancellationRequested) {
+    //        if (parentHiveTask != null) {
+    //          hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveTask.Task.Id, hiveTask.Task, taskData));
+    //        } else {
+    //          hiveTask.Task.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData, groups.ToList()));
+    //        }
+    //      }
+    //    }, Settings.Default.MaxRepeatServiceCalls, "Failed to add task", log);
+    //    cancellationToken.ThrowIfCancellationRequested();
+
+    //    lock (jobCountLocker) {
+    //      progress.ProgressValue = (double)taskCount[0] / totalJobCount;
+    //      progress.Status = string.Format("Uploaded task ({0} of {1})", taskCount[0], totalJobCount);
+    //    }
+
+    //    var tasks = new List<TS.Task>();
+    //    foreach (HiveTask child in hiveTask.ChildHiveTasks) {
+    //      var task = TS.Task.Factory.StartNew((tuple) => {
+    //        var arguments = (Tuple<HiveTask, HiveTask>)tuple;
+    //        UploadTaskWithChildren_Old(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);
+    //      tasks.Add(task);
+    //    }
+    //    taskUploadSemaphore.Release(); semaphoreReleased = true; // the semaphore has to be release before waitall!
+    //    TS.Task.WaitAll(tasks.ToArray());
+    //  }
+    //  finally {
+    //    if (!semaphoreReleased) taskUploadSemaphore.Release();
+    //  }
+    //}
+    
     #endregion