Changeset 1478 for trunk

Timestamp:

04/02/09 13:15:28 (15 years ago)

Author:

msteinbi

Message:

new properties for Job needed by Scheduler (#507)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/BusinessObjects/Job.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/Job.cs

@@ -26 +26 @@
 using System.Runtime.Serialization;
 using HeuristicLab.DataAccess;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
@@ -49 +50 @@
     [DataMember]
     public int Priority { get; set; }
+    [DataMember]
+    public int CoresNeeded { get; set; }
+    [DataMember]
+    public int MemoryNeeded { get; set; }
+    [DataMember]
+    public List<PluginInfo> PluginsNeeded { get; set; }
   }
 }

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

@@ -104 +104 @@
               if (dif.TotalSeconds > ApplicationConstants.HEARTBEAT_MAX_DIF) {
                 // if client calculated jobs, the job must be reset
-                if (client.State == State.calculating) {
-                  // check wich job the client was calculating and reset it
-                  foreach (Job job in jobAdapter.GetActiveJobsOf(client)) {
-                    jobManager.ResetJobsDependingOnResults(job);
-                  }
+                foreach (Job job in jobAdapter.GetActiveJobsOf(client)) {
+                  jobManager.ResetJobsDependingOnResults(job);
                 }
 
@@ -161 +158 @@
         heartbeatLock.ExitWriteLock();
 
-        // todo: allClients legacy ?
         ClientInfo client = clientAdapter.GetById(clientInfo.Id);
         if (client != null && client.State != State.offline && client.State != State.nullState) {
@@ -488 +484 @@
 
     public ResponsePlugin SendPlugins(List<PluginInfo> pluginList) {
+
+
       throw new NotImplementedException();
     }