Changeset 8939 for trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

Timestamp:

11/26/12 11:12:57 (11 years ago)

Author:

ascheibe

Message:

#1950

• added more aggressive locking so that the views don't read run collections that get modified in the meantime
• start downloading of tasks after the job has been uploaded completely
• fixed exceptions that got thrown when waiting for the threads that upload the tasks

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -294 +294 @@
         cancellationToken.ThrowIfCancellationRequested();
 
+        // upload tasks
+        refreshableJob.Progress.Status = "Uploading tasks...";
+
+        var tasks = new List<TS.Task>();
+        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);
+          }, hiveTask);
+          task.ContinueWith((x) => refreshableJob.Log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted);
+          tasks.Add(task);
+        }
+        TS.Task.WaitAll(tasks.ToArray());
+      }
+      finally {
         refreshableJob.RefreshAutomatically = true;
         refreshableJob.StartResultPolling();
-
-        // upload tasks
-        refreshableJob.Progress.Status = "Uploading tasks...";
-
-        var tasks = new List<TS.Task>();
-        foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
-          tasks.Add(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);
-          }, hiveTask)
-          .ContinueWith((x) => refreshableJob.Log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
-        }
-        try {
-          TS.Task.WaitAll(tasks.ToArray());
-        }
-        catch (AggregateException ae) {
-          if (!ae.InnerExceptions.All(e => e is TaskCanceledException)) throw ae; // for some reason the WaitAll throws a AggregateException containg a TaskCanceledException. i don't know where it comes from, however the tasks all finish properly, so for now just ignore it
-        }
         refreshableJob.Job.Modified = false;
-      }
-      finally {
         refreshableJob.IsProgressing = false;
         refreshableJob.Progress.Finish();
@@ -405 +400 @@
         var tasks = new List<TS.Task>();
         foreach (HiveTask child in hiveTask.ChildHiveTasks) {
-          tasks.Add(TS.Task.Factory.StartNew((tuple) => {
+          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);
-          }, new Tuple<HiveTask, HiveTask>(child, hiveTask))
-          .ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
+          }, 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!
-        try {
-          TS.Task.WaitAll(tasks.ToArray());
-        }
-        catch (AggregateException ae) {
-          if (!ae.InnerExceptions.All(e => e is TaskCanceledException)) throw ae; // for some reason the WaitAll throws a AggregateException containg a TaskCanceledException. i don't know where it comes from, however the tasks all finish properly, so for now just ignore it
-        }
+        TS.Task.WaitAll(tasks.ToArray());
       }
       finally {