Changeset 6202

Timestamp:

05/16/11 16:10:10 (14 years ago)

Author:

cneumuel

Message:

#1233

• stability fixes for slave

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• Core.cs (modified) (4 diffs)
• Exceptions/JobAlreadyExistsException.cs (added)
• HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• SlaveStatusInfo.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -443 +443 @@
 
     private static object startInAppDomainLocker = new object();
-
+    private static Mutex startInAppDomainMutex = new Mutex();
     /// <summary>
     /// A new Job from the wcfService has been received and will be started within a AppDomain.
@@ -451 +451 @@
       clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
 
-      lock (startInAppDomainLocker) {
+      startInAppDomainMutex.WaitOne(); // mutex is used instead of lock to be able to release it before executor.Start() is called (which may take long time)
+      bool released = false;
+
         if (executors.ContainsKey(job.Id)) {
           clientCom.LogMessage("Job with key " + job.Id + " already exists. Job will be ignored.");
@@ -488 +490 @@
             clientCom.LogMessage("Starting Executor for job " + job.Id);
             lock (executors) {
+              if (executors.ContainsKey(job.Id)) {
+                throw new JobAlreadyExistsException(job.Id);
+              }
               executors.Add(job.Id, executor);
             }
+            startInAppDomainMutex.ReleaseMutex();
+            released = true;
             semaphores[job.Id] = new Semaphore(0, 1);
             executor.Start(jobData.Data);
             semaphores[job.Id].Release();
+          }
+          catch (JobAlreadyExistsException e) {
+            clientCom.LogMessage(string.Format("Job {0} has already been started. Job will be ignored", e.JobId));
           }
           catch (Exception exception) {
@@ -507 +517 @@
             KillAppDomain(job.Id);
           }
-        }
-      }
+
+          if (!released)
+            startInAppDomainMutex.ReleaseMutex();
+        }
       heartbeatManager.AwakeHeartBeatThread();
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -100 +100 @@
     <Compile Include="Exceptions\JobNotFoundException.cs" />
     <Compile Include="Exceptions\JobNotDataFoundException.cs" />
+    <Compile Include="Exceptions\JobAlreadyExistsException.cs" />
     <Compile Include="SlaveClientCom.cs" />
     <Compile Include="Core.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveStatusInfo.cs

@@ -27 +27 @@
     static public int JobsAborted { get; set; }
     static public int JobsFetched { get; set; }
-    static public DateTime LoginTime { get; set; }            
+    static public DateTime LoginTime { get; set; }
   }
 }