Changeset 9508 for branches/OaaS/HeuristicLab.Services.Optimization.Web

Timestamp:

05/22/13 15:29:15 (11 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.Web

Files:

• Binders/ExperimentJsonAttribute.cs (added)
• Content/experiment.controller.js (modified) (1 diff)
• Content/experiment.view.js (modified) (2 diffs)
• Content/job.controller.js (modified) (2 diffs)
• HeuristicLab.Services.Optimization.Web.csproj (modified) (1 diff)
• Views/Shared/_Layout.cshtml (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/experiment.controller.js

@@ -36 +36 @@
             loadingDialog.render();
             // send experiment to server
-            experimentModel.save({}, { success: function () {
-                loadingDialog.setLoading(false);
-                loadingDialog.text('Experiment successfully saved!');
-                loadingDialog.render();
-                if (availableExperiments)
-                    availableExperiments.fetch({ cache: false, success: function (itm) {
-                        selectableGroup.render();
-                    }
-                    });
-            }
+            experimentModel.save({}, { 
+                success: function () {
+                    loadingDialog.setLoading(false);
+                    loadingDialog.text('Experiment successfully saved!');
+                    loadingDialog.render();
+                    if (availableExperiments)
+                        availableExperiments.fetch({ cache: false, success: function (itm) {
+                            selectableGroup.render();
+                        }
+                        });
+                },
+                error: function (model, response, options) {
+                    loadingDialog.setLoading(false);
+                    loadingDialog.text('Failed to save Experiment - Please log off an and on and try again!');
+                    loadingDialog.render();
+                }
             });
             //loadingDialog.close();

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/experiment.view.js

@@ -816 +816 @@
         },
         render: function () {
+            if (this.model.models.length == 0)
+                return;
+
             var self = this;
             var ele = $(_.template($('#runcollection_template').html(), {}));
@@ -1039 +1042 @@
                 } else {
                     var valueProvider = _.find(this.model.models[i].get('results'), function (itm) { return itm.Name == self.bubbleSelect.val(); });
-                    if (!valueProvider) 
+                    if (!valueProvider)
                         valueProvider = _.find(this.model.models[i].get('params'), function (itm) { return itm.Name == self.bubbleSelect.val(); });
 
-                    if (!valueProvider) {                        
+                    if (!valueProvider) {
                         size = this.options.bubbleSize;
                     } else {

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/job.controller.js

@@ -2 +2 @@
     my.JobVisualExtensionListener = function (model, element) {
         var extension = new OAAS_MODEL.VisualExtension({ id: model.get('algorithmName') });
-        extension.fetch({ cache: true, success: function () {
-            //eval extension.js -> execute addVisualExtension(model, element): 
-            var js = extension.get('ScenarioJs');
-            if (js != null) {
-                (function (model, element) {
-                    addExtension = undefined;
-                    eval(js);
-                    if (addExtension)
-                        addExtension(model, element);
-                } (model, element));
+        extension.fetch({ cache: true,
+            success: function () {
+                //eval extension.js -> execute addVisualExtension(model, element): 
+                var js = extension.get('ScenarioJs');
+                if (js != null) {
+                    (function (model, element) {
+                        addExtension = undefined;
+                        eval(js);
+                        if (addExtension)
+                            addExtension(model, element);
+                    } (model, element));
+                }
+            },
+            error: function (model, response, options) {
+                
             }
-        }
         });
     },
@@ -35 +39 @@
                 var lv = new OAAS_VIEW.LoadingView({ el: $('#jobDetails'), model: 'Loading results of job...' });
                 lv.render();
-                runList.fetch({ cache: false, success: function () {
-                    $('#jobDetails').empty();
-                    var div = $('<div/>').appendTo($('#jobDetails'));
-                    var rv = new OAAS_VIEW.ResultView({ model: runList, el: div });
-                    listener.listenTo(rv, 'renderVisualExtension', my.JobVisualExtensionListener);
-                    rv.render();
-                    var av = new OAAS_VIEW.AccordionView({ el: div });
-                    av.render();
-                }
+                runList.fetch({ cache: false,
+                    success: function () {
+                        $('#jobDetails').empty();
+                        var div = $('<div/>').appendTo($('#jobDetails'));
+                        if (runList.models && runList.models.length == 0) {
+                            $('<p/>').text('No job results available!').appendTo(div);
+                            return;
+                        }
+                        // else draw the result view
+                        var rv = new OAAS_VIEW.ResultView({ model: runList, el: div });
+                        listener.listenTo(rv, 'renderVisualExtension', my.JobVisualExtensionListener);
+                        rv.render();
+                        var av = new OAAS_VIEW.AccordionView({ el: div });
+                        av.render();
+                    },
+                    error: function (model, response, options) {
+                        $('#jobDetails').empty();
+                        var lv = new OAAS_VIEW.LoadingView({ el: $('#jobDetails'), model: 'Error during retrieval!' });
+                        lv.render();
+                    }
                 });
             });

branches/OaaS/HeuristicLab.Services.Optimization.Web/HeuristicLab.Services.Optimization.Web.csproj

@@ -120 +120 @@
     <Content Include="Content\experiment.view.js" />
     <Content Include="Content\ExperimentSupport.js" />
-    <Compile Include="Binders\AlgorithmJsonAttribute.cs" />
+    <Compile Include="Binders\ExperimentJsonAttribute.cs" />
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\AdminController.cs" />

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/_Layout.cshtml

@@ -13 +13 @@
     <script src="@Url.Content("~/Scripts/jquery-ui-1.9.2.min.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Scripts/modernizr-1.7.min.js")" type="text/javascript"></script>
-    <script src="@Url.Content("~/Content/Styling.js")" type="text/javascript"></script>
 
     <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="/Content/jqplot/src/excanvas.js"></script><![endif]-->