Changeset 7125

Timestamp:

12/05/11 16:45:27 (12 years ago)

Author:

ascheibe

Message:

#1672

• removed magic numbers for upload retries
• speed up job downloading by placing deserializing/downloading semaphores correctly
• increased max. number of parallel downloads/deserializations
• added more status messages when downloading to make it more clear what's actually happening
• renamed some variables

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3

Files:

• ConcurrentTaskDownloader.cs (modified) (2 diffs)
• HiveClient.cs (modified) (8 diffs)
• HiveJobs/HiveTask.cs (modified) (1 diff)
• HiveJobs/OptimizerHiveTask.cs (modified) (8 diffs)
• Settings.Designer.cs (modified) (3 diffs)
• Settings.settings (modified) (1 diff)
• app.config (modified) (1 diff)

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

@@ -78 +78 @@
     protected Tuple<Task, TaskData> DownloadTaskData(Task task) {
       downloadSemaphore.WaitOne();
-      deserializeSemaphore.WaitOne();
       TaskData result;
       try {
@@ -90 +89 @@
 
     protected Tuple<Task, T> DeserializeTask(Tuple<Task, TaskData> taskData) {
+      deserializeSemaphore.WaitOne();
       try {
         if (abort || taskData.Item2 == null || taskData.Item1 == null) return null;

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

@@ -113 +113 @@
         jobs = null;
         throw;
-      }
-      finally {
+      } finally {
         OnRefreshed();
       }
@@ -297 +296 @@
         }
         refreshableJob.Job.Modified = false;
-      }
-      finally {
+      } finally {
         refreshableJob.IsProgressing = false;
       }
@@ -362 +360 @@
             }
           }
-        }, -1, "Failed to upload plugins");
+        }, Settings.Default.MaxRepeatServiceCalls, "Failed to upload plugins");
         cancellationToken.ThrowIfCancellationRequested();
         hiveTask.Task.PluginsNeededIds.Add(configPluginId);
@@ -377 +375 @@
             }
           }
-        }, 50, "Failed to add task", log);
+        }, Settings.Default.MaxRepeatServiceCalls, "Failed to add task", log);
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -400 +398 @@
           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
         }
-      }
-      finally {
+      } finally {
         if (!semaphoreReleased) taskUploadSemaphore.Release();
       }
@@ -423 +420 @@
         totalJobCount = allTasks.Count();
 
+        refreshableJob.Progress.Status = "Downloading tasks...";
         TaskDownloader downloader = new TaskDownloader(allTasks.Select(x => x.Id));
         downloader.StartAsync();
@@ -445 +443 @@
         }
 
+        refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";
         // build child-task tree
         foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
@@ -451 +450 @@
 
         refreshableJob.OnLoaded();
-      }
-      finally {
+      } finally {
         refreshableJob.IsProgressing = false;
       }
     }
 
-    private static void BuildHiveJobTree(HiveTask parentHiveJob, IEnumerable<LightweightTask> allJobs, IDictionary<Guid, HiveTask> allHiveJobs) {
-      IEnumerable<LightweightTask> childTasks = from job in allJobs
-                                                where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveJob.Task.Id
+    private static void BuildHiveJobTree(HiveTask parentHiveTask, IEnumerable<LightweightTask> allTasks, IDictionary<Guid, HiveTask> allHiveTasks) {
+      IEnumerable<LightweightTask> childTasks = from job in allTasks
+                                                where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveTask.Task.Id
                                                 orderby job.DateCreated ascending
                                                 select job;
       foreach (LightweightTask task in childTasks) {
-        HiveTask childHiveTask = allHiveJobs[task.Id];
-        parentHiveJob.AddChildHiveJob(childHiveTask);
-        BuildHiveJobTree(childHiveTask, allJobs, allHiveJobs);
+        HiveTask childHiveTask = allHiveTasks[task.Id];
+        parentHiveTask.AddChildHiveTask(childHiveTask);
+        BuildHiveJobTree(childHiveTask, allTasks, allHiveTasks);
       }
     }

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

@@ -238 +238 @@
     }
 
-    public virtual void AddChildHiveJob(HiveTask hiveJob) {
+    public virtual void AddChildHiveTask(HiveTask hiveTask) {
       childHiveTasksLock.EnterWriteLock();
       try {
-        this.childHiveTasks.Add(hiveJob);
+        this.childHiveTasks.Add(hiveTask);
       }
       finally { childHiveTasksLock.ExitWriteLock(); }

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs

@@ -136 +136 @@
             }
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -152 +151 @@
             }
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -163 +161 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -174 +171 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -205 +201 @@
           child.syncTasksWithOptimizers = true;
         }
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
       syncTasksWithOptimizers = true;
     }
@@ -268 +263 @@
           child.SetIndexInParentOptimizerList(this);
         }
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
-    }
-
-    public override void AddChildHiveJob(HiveTask hiveJob) {
-      base.AddChildHiveJob(hiveJob);
-      var optimizerHiveJob = (OptimizerHiveTask)hiveJob;
+      } finally { childHiveTasksLock.ExitReadLock(); }
+    }
+
+    public override void AddChildHiveTask(HiveTask hiveTask) {
+      base.AddChildHiveTask(hiveTask);
+      var optimizerHiveJob = (OptimizerHiveTask)hiveTask;
       syncTasksWithOptimizers = false;
       if (this.ItemTask != null && optimizerHiveJob.ItemTask != null) {
@@ -339 +333 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -351 +344 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 

trunk/sources/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs

@@ -44 +44 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("00:00:10")]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
         public global::System.TimeSpan ResultPollingInterval {
             get {
@@ -53 +53 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        [global::System.Configuration.DefaultSettingValueAttribute("5")]
         public int MaxParallelDownloads {
             get {
@@ -59 +59 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("5")]
+        public int MaxRepeatServiceCalls {
+            get {
+                return ((int)(this["MaxRepeatServiceCalls"]));
+            }
+        }
     }
 }

trunk/sources/HeuristicLab.Clients.Hive/3.3/Settings.settings

@@ -10 +10 @@
     </Setting>
     <Setting Name="ResultPollingInterval" Type="System.TimeSpan" Scope="Application">
-      <Value Profile="(Default)">00:00:10</Value>
+      <Value Profile="(Default)">00:00:20</Value>
     </Setting>
     <Setting Name="MaxParallelDownloads" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">2</Value>
+      <Value Profile="(Default)">5</Value>
+    </Setting>
+    <Setting Name="MaxRepeatServiceCalls" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">5</Value>
     </Setting>
   </Settings>

trunk/sources/HeuristicLab.Clients.Hive/3.3/app.config

@@ -15 +15 @@
       </setting>
       <setting name="ResultPollingInterval" serializeAs="String">
-        <value>00:00:10</value>
+        <value>00:00:20</value>
       </setting>
       <setting name="MaxParallelDownloads" serializeAs="String">
-        <value>2</value>
+        <value>5</value>
+      </setting>
+      <setting name="MaxRepeatServiceCalls" serializeAs="String">
+        <value>5</value>
       </setting>
     </HeuristicLab.Clients.Hive.Settings>