Changeset 9508 for branches/OaaS/HeuristicLab.Clients.Hive.Slave.AzureClient

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.Clients.Hive.Slave.AzureClient/3.3

Files:

• HeuristicLab.Clients.Hive.Slave.AzureClient-3.3.csproj (modified) (3 diffs)
• HiveHelper.cs (added)
• WorkerRole.cs (modified) (3 diffs)

branches/OaaS/HeuristicLab.Clients.Hive.Slave.AzureClient/3.3/HeuristicLab.Clients.Hive.Slave.AzureClient-3.3.csproj

@@ -39 +39 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Clients.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HeuristicLab.Clients.Hive-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.7.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
@@ -50 +62 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Services.Client" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -58 +71 @@
   <ItemGroup>
     <Compile Include="Constants.cs" />
+    <Compile Include="HiveHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WorkerRole.cs" />

branches/OaaS/HeuristicLab.Clients.Hive.Slave.AzureClient/3.3/WorkerRole.cs

@@ -34 +34 @@
 
   public class WorkerRole : RoleEntryPoint {
-    private Core core;
+    private HeuristicLab.Clients.Hive.SlaveCore.Core core;
     private Thread coreThread;
 
@@ -43 +43 @@
       try {
         LogError(new Exception("Starting Run()..."));
-        core = new Core(false);
+        core = new HeuristicLab.Clients.Hive.SlaveCore.Core(false);
 
         string hiveServerAddress = RoleEnvironment.GetConfigurationSettingValue(HiveServerAddressSetting);
@@ -55 +55 @@
         coreThread = new Thread(core.Start);
         coreThread.Start();
+
+        WcfService.Instance.Connected += new EventHandler((sender, e) => {
+          HiveHelper.RegisterSlaveToGroup(RoleEnvironment.GetConfigurationSettingValue("HiveGroup"));
+        });
 
         LogError(new Exception("Run(): Core started successfullly"));