Changeset 1752 for trunk

Timestamp:

05/07/09 14:23:48 (16 years ago)

Author:

msteinbi

Message:

time to life added for new assigned jobs (#531)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs

@@ -29 +29 @@
 
     public static int HEARTBEAT_MAX_DIF = 120; // value in seconds
+    public static int JOB_TIME_TO_LIVE = 5;
 
     public static string RESPONSE_SERVERCONSOLE_LOGIN_SUCCESS = "Logged in";

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

@@ -45 +45 @@
     private static Dictionary<Guid, DateTime> lastHeartbeats = 
       new Dictionary<Guid,DateTime>();
+    private static Dictionary<Guid, int> newAssignedJobs =
+      new Dictionary<Guid, int>();
 
     private static ReaderWriterLockSlim heartbeatLock =
@@ -110 +112 @@
                 foreach (Job job in jobAdapter.GetActiveJobsOf(client)) {
                   jobManager.ResetJobsDependingOnResults(job);
+                  lock (newAssignedJobs) {
+                    if (newAssignedJobs.ContainsKey(job.Id))
+                      newAssignedJobs.Remove(job.Id);
+                  }
                 }
 
@@ -317 +323 @@
           }
           if (!found) {
-            currJob.State = State.offline;
-            jobAdapter.Update(currJob);
+            lock (newAssignedJobs) {
+              if (newAssignedJobs.ContainsKey(currJob.Id)) {
+                newAssignedJobs[currJob.Id]--;
+
+                if (newAssignedJobs[currJob.Id] <= 0) {
+                  currJob.State = State.offline;
+                  jobAdapter.Update(currJob);
+                  newAssignedJobs.Remove(currJob.Id);
+                }
+              } else {
+                currJob.State = State.offline;
+                jobAdapter.Update(currJob);
+              }
+            } // lock
+          } else {
+            lock (newAssignedJobs) {
+              if (newAssignedJobs.ContainsKey(currJob.Id))
+                newAssignedJobs.Remove(currJob.Id);
+            }
           }
         }
@@ -338 +361 @@
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
+        lock (newAssignedJobs) {
+          newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
+        }
       } else {
         response.Success = false;