Changeset 245

Timestamp:

05/13/08 23:03:56 (16 years ago)

Author:

gkronber

Message:

fixed #150 (re-queueing of jobs that were not executed in time)

File:

• trunk/sources/HeuristicLab.Grid/EngineStore.cs (modified) (10 diffs)

trunk/sources/HeuristicLab.Grid/EngineStore.cs

@@ -31 +31 @@
     private List<Guid> engineList;
     private Dictionary<Guid, byte[]> waitingEngines;
+    private Dictionary<Guid, byte[]> runningEngines;
     private Dictionary<Guid, ManualResetEvent> waitHandles;
     private Dictionary<Guid, byte[]> results;
     private Dictionary<Guid, DateTime> resultDate;
+    private Dictionary<Guid, DateTime> runningEngineDate;
+    private const int RESULT_EXPIRY_TIME_MIN = 10;
+    private const int RUNNING_JOB_EXPIRY_TIME_MIN = 10;
     private object bigLock;
-    private ChannelFactory<IClient> clientChannelFactory;
     public int WaitingJobs {
       get {
@@ -57 +60 @@
       engineList = new List<Guid>();
       waitingEngines = new Dictionary<Guid, byte[]>();
+      runningEngines = new Dictionary<Guid, byte[]>();
       waitHandles = new Dictionary<Guid, ManualResetEvent>();
       results = new Dictionary<Guid, byte[]>();
       resultDate = new Dictionary<Guid, DateTime>();
+      runningEngineDate = new Dictionary<Guid, DateTime>();
       bigLock = new object();
 
@@ -68 +73 @@
       binding.Security.Mode = SecurityMode.None;
 
-      clientChannelFactory = new ChannelFactory<IClient>(binding);
     }
 
@@ -82 +86 @@
           engine = waitingEngines[guid];
           waitingEngines.Remove(guid);
+          runningEngines[guid] = engine;
+          runningEngineDate[guid] = DateTime.Now;
           return true;
         }
@@ -90 +96 @@
       lock(bigLock) {
         // clear old results
-        List<Guid> expiredResults = FindExpiredResults(DateTime.Now.AddMinutes(-10.0));
+        List<Guid> expiredResults = FindExpiredResults(DateTime.Now.AddMinutes(-RESULT_EXPIRY_TIME_MIN));
         foreach(Guid expiredGuid in expiredResults) {
           results.Remove(expiredGuid);
@@ -97 +103 @@
         }
         // add the new result
+        runningEngines.Remove(guid);
+        runningEngineDate.Remove(guid);
         results[guid] = result;
         resultDate[guid] = DateTime.Now;
@@ -111 +119 @@
       }
       return expiredResults;
+    }
+    private List<Guid> FindExpiredJobs(DateTime expirationDate) {
+      List<Guid> expiredJobs = new List<Guid>();
+      foreach(Guid guid in runningEngines.Keys) {
+        if(runningEngineDate[guid] < expirationDate) {
+          expiredJobs.Add(guid);
+        }
+      }
+      return expiredJobs;
     }
 
@@ -139 +156 @@
           // result not yet available, if there is also no wait-handle for that result then we will never have a result and can return null
           if(!waitHandles.ContainsKey(guid)) return null;
-
           // otherwise we have a wait-handle and can wait for the result
           ManualResetEvent waitHandle = waitHandles[guid];
@@ -150 +166 @@
             return result;
           } else {
-            // no result yet return without result
+            // no result yet, check for which jobs we waited too long and requeue those jobs
+            List<Guid> expiredJobs = FindExpiredJobs(DateTime.Now.AddMinutes(-RUNNING_JOB_EXPIRY_TIME_MIN));
+            foreach(Guid expiredGuid in expiredJobs) {
+              engineList.Insert(0, expiredGuid);
+              waitingEngines[expiredGuid] = runningEngines[expiredGuid];
+              runningEngines.Remove(expiredGuid);
+              runningEngineDate.Remove(expiredGuid);
+            }
             return null;
           }
@@ -158 +181 @@
 
     internal void AbortEngine(Guid guid) {
-      lock(bigLock) {
-        if(waitingEngines.ContainsKey(guid)) {
-          byte[] engine = waitingEngines[guid];
-          waitingEngines.Remove(guid);
-          engineList.Remove(guid);
-          waitHandles[guid].Set();
-          results.Add(guid, engine);
-        }
-      }
+      throw new NotImplementedException();
     }