Changeset 9508 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL

Timestamp:

05/22/13 15:29:15 (12 years ago)

Author:

fschoepp

Message:

#1888:
HL:

• Web projects requires different users to interact with hive. The singleton HiveServiceLocator.Instance doesn't allow different users at the same time, resulting in serialization during access of HiveClient methods.

The following changes have been introduced in favor of a parallel use of the HL libs:

• HiveClient, TaskDownloader and ConcurrentTaskDownloader may now use a different IHiveServiceLocator than HiveServiceLocator.Instance (all methods have appropriate overloads now).
• The default instance is still HiveServiceLocator.Instance.

Automated Scaling of Instances:

• Added Scaler project to solution which represents a WorkerRole that scales the slave instances based on the global cpu utilization of all slaves.
• Scaler is based on WASABi, rules can be adjusted in rulesstore.xml. Basic rule is: if < 45% global cpu utilization => remove an instance; if > 65% cpu => add an instance. Minimum boundary is 1 and maximum boundary is 8 slave instances.
• Adjusted Slave project to automatically register itself to a SlaveGroup during WebRole startup (can be adjusted in service configuration).

Web-Frontend:

• Added basic error messages to the dialogs when an ajax call fails.
• Removed Styling.js from scripts.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL

Files:

• HLMapper.cs (modified) (1 diff)
• HiveScenarioManager.cs (modified) (10 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HLMapper.cs

@@ -37 +37 @@
     public static DoubleMatrix ConvertToDoubleMatrix(Parameter parameter) {
       var matrix = parameter.Value as DecimalMatrix;
-      // TODO: Check for empty matrices
+      
+      if (matrix.Value.Length == 0 || matrix.Value[0].Length == 0) {
+        return new DoubleMatrix(new double[0, 0]);
+      }
+
       double[,] data = new double[matrix.Value.Length, matrix.Value[0].Length];
       for (int i=0; i < matrix.Value.Length; i++) {

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs

@@ -81 +81 @@
 
     public bool DispatchExperiment(User user, Model.Experiment exp, JobExecutionDetails details) {
-      // TODO: Determine how to build a tree of IAlgorithm
       // For now the experiment will be flatened for execution
       HeuristicLab.Optimization.Experiment hiveExperiment = new HeuristicLab.Optimization.Experiment(exp.Name);
@@ -94 +93 @@
         var entry = stack.Pop();
         // handle current entry
-
-        // TODO: Store scenario name in entry.Child.Mapper when saving
         foreach (var child in entry.Children) {
           // This is a template experiment; 
@@ -215 +212 @@
       }      
       job.HiveTasks.Add(new OptimizerHiveTask(exp));
-      var service = ConfigureHive(user);
-      
-      // TODO: Fix HiveClient class to be not dependent on singleton HiveServiceLocator!!!
-      HiveServiceLocator.Instance.Username = user.Username;
-      HiveServiceLocator.Instance.Password = user.Password;
-      HiveServiceLocator.Instance.EndpointConfigurationName = Configuration.HiveEndpointName;
-      HiveClient.Store(job, new CancellationToken());
+            
+      var locator = ConfigureHive(user);
+      HiveClient.Store(job, new CancellationToken(), locator);
       
       job.StopResultPolling();
@@ -277 +270 @@
         taskIds.Add(task.Id);
       }
-
-      // TODO: Fix problems with the HiveServiceLocater singleton!!!
-      HiveServiceLocator.Instance.Username = user.Username;
-      HiveServiceLocator.Instance.Password = user.Password;
-      HiveServiceLocator.Instance.EndpointConfigurationName = Configuration.HiveEndpointName;
-      TaskDownloader downloader = new TaskDownloader(taskIds);
+ 
+      TaskDownloader downloader = new TaskDownloader(taskIds, ConfigureHive(user));
       downloader.StartAsync();
       while (!downloader.IsFinished) {        
@@ -291 +280 @@
         }
       }
-      //var experiment = dal.JobDao.FindByJobId(user.Username, id);
 
       IDictionary<Guid, HiveTask> hiveTasks = downloader.Results;
@@ -330 +318 @@
       return runs;
     }
-
-    //TODO: We might need images / +++
     
     private Parameter MapHiveDataType(string name, IItem item) {
@@ -341 +327 @@
       var result = new Parameter();
       result.Type = ParameterType.String;
-      //TODO: How shall we handle dll specific datatypes?      
-      //if (item is PathTSPTour) {
-      //  var tour = item as PathTSPTour;           
-      //}
-      //else 
       if (item is IStringConvertibleValue) {
         var value = (item as IStringConvertibleValue).GetValue();
@@ -440 +421 @@
         result.Value = new HeuristicLab.Services.Optimization.ControllerService.Model.StringValue() { Name = name, Value = item.ItemName != null ? item.ItemName + " (Cannot be displayed properly as string)" : "Cannot be displayed properly as string" };
       }
-      // TODO: Add workaround for TSP
       return result;
     }
@@ -541 +521 @@
 
     public Model.Task GetTaskData(User u, string jobId, string taskId) {
-      ConfigureHive(u);
-      HiveServiceLocator.Instance.Username = u.Username;
-      HiveServiceLocator.Instance.Password = u.Password;
-      HiveServiceLocator.Instance.EndpointConfigurationName = Configuration.HiveEndpointName;
-      TaskDownloader downloader = new TaskDownloader(new List<Guid>(){Guid.Parse(taskId)});
+      TaskDownloader downloader = new TaskDownloader(new List<Guid>(){Guid.Parse(taskId)}, ConfigureHive(u));
       downloader.StartAsync();
       while (!downloader.IsFinished) {
@@ -583 +559 @@
       // push all elements to dictionary
       foreach (var task in jobTasks) {
-        // TODO: Crawl children + parent and create hierarchy!
         var children = serviceLocator.CallHiveService<IEnumerable<HeuristicLab.Clients.Hive.LightweightTask>>(s => s.GetLightweightChildTasks(Guid.Parse(jobId), true, true));
         foreach (var child in children) {