Changeset 3013

Timestamp:

03/12/10 13:42:37 (14 years ago)

Author:

kgrading

Message:

fixed HiveBridge and removed compile errors (#830)

Location:

trunk/sources

Files:

• HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs

@@ -48 +48 @@
 
     public JobState JobState(Guid guid) {
-      ResponseObject<SerializedJobResult> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
+      ResponseObject<SerializedJob> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
       if (response != null) {
         return HeuristicLab.Grid.JobState.Busy;
@@ -57 +57 @@
       var jobObj = CreateJobObj(engine);
 
-      ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.Job> res = SavelyExecute(() => executionEngine.AddJob(jobObj));
+      ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> res = SavelyExecute(() => executionEngine.AddJob(jobObj));
       return res == null ? Guid.Empty : res.Obj.Id;
     }
 
     public byte[] TryEndExecuteEngine(Guid guid) {
-      ResponseObject<SerializedJobResult> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
+      ResponseObject<SerializedJob> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
       if (response != null &&
         response.Success && response.Obj != null) {
-        HeuristicLab.Hive.Engine.Job restoredJob = (HeuristicLab.Hive.Engine.Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobResultData);
+        HeuristicLab.Hive.Engine.Job restoredJob = (HeuristicLab.Hive.Engine.Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
         // only return the engine when it wasn't canceled (result is only a snapshot)
         if (restoredJob.Progress == 1.0) {
@@ -86 +86 @@
 
     private HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob CreateJobObj(byte[] serializedEngine) {
-      HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
+      HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
 
-      List<HivePluginInfo> requiredPlugins = new List<HivePluginInfo>();
+      List<HivePluginInfoDto> requiredPlugins = new List<HivePluginInfoDto>();
       IEngine engine = RestoreEngine(serializedEngine, requiredPlugins);
 
@@ -119 +119 @@
     }
 
-    private IEngine RestoreEngine(byte[] serializedEngine, List<HivePluginInfo> requiredPlugins) {
+    private IEngine RestoreEngine(byte[] serializedEngine, List<HivePluginInfoDto> requiredPlugins) {
       // unzip and restore to determine the list of required plugins (NB: inefficient!)
       MemoryStream memStream = new MemoryStream(serializedEngine);
@@ -144 +144 @@
 
       foreach (IPluginDescription uniquePlugin in plugins) {
-        HivePluginInfo pluginInfo =
-          new HivePluginInfo();
+        HivePluginInfoDto pluginInfo =
+          new HivePluginInfoDto();
         pluginInfo.Name = uniquePlugin.Name;
         pluginInfo.Version = uniquePlugin.Version.ToString();

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -422 +422 @@
 
       lblJobName.Text = currentJob.Id.ToString();
-      progressJob.Value = (int)(currentJob.Percentage * 100);
-      lblProgress.Text = (int)(currentJob.Percentage * 100) + "% calculated";
+      if (currentJob.Percentage != null) {
+        progressJob.Value = (int) (currentJob.Percentage*100);
+        lblProgress.Text = (int) (currentJob.Percentage*100) + "% calculated";
+      }
 
       ListViewItem lvi = new ListViewItem();

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -103 +103 @@
                               " wasn't offline but hasn't sent heartbeats - setting offline");
               client.State = State.offline;
-              DaoLocator.ClientDao.Update(client);
-              //clientAdapter.Update(client);
+              DaoLocator.ClientDao.Update(client);              
               HiveLogger.Info(this.ToString() + ": Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - Resetting all his jobs");

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs

@@ -102 +102 @@
     public Stream GetSerializedJobStream(Guid jobId) {
       HiveDataContext hdc = new HiveDataContext();
-      hdc.Transaction = null;
-
+      String ConnStr = hdc.Connection.ConnectionString;
+      SqlConnection connection = new SqlConnection(hdc.Connection.ConnectionString);      
       VarBinarySource source =
         new VarBinarySource(
-          hdc.Connection as SqlConnection, null,
+          connection, null,
           "Job", "SerializedJob", "JobId", jobId);
 

trunk/sources/HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs

@@ -17 +17 @@
       Object obj;
       
-      using (TransactionScope scope = new TransactionScope()) {
+     // using (TransactionScope scope = new TransactionScope()) {
         try {
           obj = invocation.Proceed();
-          scope.Complete();
+     //     scope.Complete();
         } finally {
           ContextFactory.Context.Dispose();
@@ -27 +27 @@
           Console.WriteLine("Disposing old Context");      
         }
-      }     
+     // }     
       Console.WriteLine(DateTime.Now + " - " + Thread.CurrentThread.ManagedThreadId + " - Leaving Method " + invocation.Method.Name);            
       return obj;