Changeset 1998

Timestamp:

06/04/09 15:12:36 (16 years ago)

Author:

msteinbi

Message:

added pending jobs functionality (#531)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/Client.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/Client.cs

@@ -28 +28 @@
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
 
-  public enum State { nullState, idle, calculating, offline, finished, abort, requestSnapshot, requestSnapshotSent };
+  public enum State { nullState, idle, calculating, offline, finished, abort, requestSnapshot, requestSnapshotSent, pending };
 
   [DataContract]

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

@@ -47 +47 @@
     private static Dictionary<Guid, int> newAssignedJobs =
       new Dictionary<Guid, int>();
+    private static Dictionary<Guid, int> pendingJobs =
+      new Dictionary<Guid, int>();
 
     private static ReaderWriterLockSlim heartbeatLock =
@@ -55 +57 @@
     private IInternalJobManager jobManager;
     private IScheduler scheduler;
+
+    private static int PENDING_TIMEOUT = 100;
 
     /// <summary>
@@ -139 +143 @@
           }
         }
+        CheckForPendingJobs(jobAdapter);
+
         tx.Commit();
       }
@@ -149 +155 @@
         if (session != null)
           session.EndSession();
+      }
+    }
+
+    private void CheckForPendingJobs(IJobAdapter jobAdapter) {
+      IList<Job> pendingJobsInDB = new List<Job>(jobAdapter.GetJobsByState(State.pending));
+
+      foreach (Job currJob in pendingJobsInDB) {
+        lock (pendingJobs) {
+          if (pendingJobs.ContainsKey(currJob.Id)) {
+            if (pendingJobs[currJob.Id] <= 0) {
+              currJob.State = State.offline;
+              jobAdapter.Update(currJob);
+            } else {
+              pendingJobs[currJob.Id]--;
+            }
+          } 
+        }
       }
     }
@@ -423 +446 @@
           job.State = State.calculating;
         }
-        if (job.State != State.calculating) {
+        if (job.State != State.calculating && job.State != State.pending) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
@@ -587 +610 @@
           return response;
         }
-        //job.State = State.finished;
-        //jobAdapter.Update(job);
+        job.State = State.pending;
+        lock (pendingJobs) {
+          pendingJobs.Add(job.Id, PENDING_TIMEOUT);
+        }
+
+        jobAdapter.Update(job);
 
         response.Success = true;