Changeset 7177 for trunk/sources/HeuristicLab.Clients.Hive

Timestamp:

12/12/11 16:25:17 (13 years ago)

Author:

ascheibe

Message:

#1672 fixed setting of priorities in the Job Manager

Location:

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

Files:

• HiveTask.cs (modified) (11 diffs)
• OptimizerHiveTask.cs (modified) (2 diffs)

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

@@ -121 +121 @@
               hiveJob.IsControllable = value;
             }
-          }
-          finally {
+          } finally {
             childHiveTasksLock.ExitReadLock();
           }
@@ -136 +135 @@
         try {
           return childHiveTasks.AsReadOnly();
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       }
     }
@@ -192 +190 @@
       try {
         this.childHiveTasks = cloner.Clone(original.childHiveTasks);
-      }
-      finally { original.childHiveTasksLock.ExitReadLock(); }
+      } finally { original.childHiveTasksLock.ExitReadLock(); }
       this.syncTasksWithOptimizers = original.syncTasksWithOptimizers;
       this.isFinishedTaskDownloaded = original.isFinishedTaskDownloaded;
@@ -242 +239 @@
       try {
         this.childHiveTasks.Add(hiveTask);
-      }
-      finally { childHiveTasksLock.ExitWriteLock(); }
+      } finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -340 +336 @@
         IsFinishedTaskDownloaded = false;
       }
+      if (e.PropertyName == "Priority" && Task != null) {
+        foreach (var task in childHiveTasks) {
+          task.Task.Priority = Task.Priority;
+        }
+      }
     }
     #endregion
@@ -355 +356 @@
         }
         return jobs;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -370 +370 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitWriteLock(); }
+      } finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -388 +387 @@
               return result;
           }
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       }
       return null;
@@ -404 +402 @@
           child.RemoveByTaskId(jobId);
         }
-      }
-      finally { childHiveTasksLock.ExitWriteLock(); }
+      } finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -458 +455 @@
             HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
           }
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       } else {
         HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
@@ -472 +468 @@
             HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
           }
-        }
-        finally { childHiveTasksLock.ExitReadLock(); }
+        } finally { childHiveTasksLock.ExitReadLock(); }
       } else {
         HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));

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

@@ -65 +65 @@
             Optimization.Experiment experiment = (Optimization.Experiment)ItemTask.Item;
             foreach (IOptimizer childOpt in experiment.Optimizers) {
-              this.childHiveTasks.Add(new OptimizerHiveTask(childOpt));
+              var optimizerHiveTask = new OptimizerHiveTask(childOpt);
+              optimizerHiveTask.Task.Priority = Task.Priority; //inherit priority from parent
+              this.childHiveTasks.Add(optimizerHiveTask);
             }
           } else if (ItemTask.Item is Optimization.BatchRun) {
@@ -71 +73 @@
             if (batchRun.Optimizer != null) {
               while (this.childHiveTasks.Count < batchRun.Repetitions) {
-                this.childHiveTasks.Add(new OptimizerHiveTask(batchRun.Optimizer));
+                var optimizerHiveTask = new OptimizerHiveTask(batchRun.Optimizer);
+                optimizerHiveTask.Task.Priority = Task.Priority;
+                this.childHiveTasks.Add(optimizerHiveTask);
               }
               while (this.childHiveTasks.Count > batchRun.Repetitions) {