Changeset 2058 for trunk/sources/HeuristicLab.CEDMA.Server/3.3

Timestamp:

06/18/09 15:01:10 (15 years ago)

Author:

gkronber

Message:

Refactored JobManager and added a plugin that contains a bridge between grid and hive. The bridge allows to use the execution engine service of Hive as a grid server. This way CEDMA job execution and DistributedEngine job execution can either use Hive or Grid as backend. #642 (Hive backend for CEDMA)

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• GridExecuter.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server-3.3.csproj (modified) (2 diffs)
• HeuristicLabCedmaServerPlugin.cs (modified) (1 diff)
• HiveExecuter.cs (deleted)
• Server.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs

@@ -53 +53 @@
     }
 
-    public GridExecuter(IDispatcher dispatcher, IStore store, string gridUrl)
+    public GridExecuter(IDispatcher dispatcher, IStore store, IGridServer server)
       : base(dispatcher, store) {
-      this.jobManager = new JobManager(gridUrl);
+      this.jobManager = new JobManager(server);
       activeAlgorithms = new Dictionary<AsyncGridResult, IAlgorithm>();
       jobManager.Reset();

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj

@@ -92 +92 @@
   <ItemGroup>
     <Compile Include="ExecuterBase.cs" />
-    <Compile Include="HiveExecuter.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="IExecuter.cs" />
     <Compile Include="DispatcherBase.cs" />
@@ -136 +133 @@
       <Name>HeuristicLab.Data-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Grid.HiveBridge\3.2\HeuristicLab.Grid.HiveBridge-3.2.csproj">
+      <Project>{DFAC1BEA-6D9D-477F-AC7B-E64977644DDB}</Project>
+      <Name>HeuristicLab.Grid.HiveBridge-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Grid\3.2\HeuristicLab.Grid-3.2.csproj">
       <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>
       <Name>HeuristicLab.Grid-3.2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Engine\3.2\HeuristicLab.Hive.Engine-3.2.csproj">
-      <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
-      <Name>HeuristicLab.Hive.Engine-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLabCedmaServerPlugin.cs

@@ -31 +31 @@
   [Dependency(Dependency = "HeuristicLab.CEDMA.DB-3.3")]
   [Dependency(Dependency = "HeuristicLab.Grid-3.2")]
+  [Dependency(Dependency = "HeuristicLab.Grid.HiveBridge-3.2")]
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   [Dependency(Dependency = "HeuristicLab.Data-3.2")]

trunk/sources/HeuristicLab.CEDMA.Server/3.3/Server.cs

@@ -30 +30 @@
 using HeuristicLab.CEDMA.DB;
 using System.ServiceModel.Description;
+using HeuristicLab.Grid;
+using HeuristicLab.Grid.HiveBridge;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -105 +107 @@
     internal void Connect(string serverUrl) {
       dispatcher = new SimpleDispatcher(store);
+      IGridServer gridServer = null;
       if (serverUrl.Contains("ExecutionEngine")) {
-        executer = new HiveExecuter(dispatcher, store, serverUrl);
+        gridServer = new HiveGridServerWrapper(serverUrl);
       } else {
         // default is grid backend
-        executer = new GridExecuter(dispatcher, store, serverUrl);
+        gridServer = new GridServerProxy(serverUrl);
       }
+      executer = new GridExecuter(dispatcher, store, gridServer);
       executer.Start();
     }