Changeset 5153 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3

Timestamp:

12/21/10 18:16:24 (14 years ago)

Author:

cneumuel

Message:

#1260

• increased timeouts for sent jobs (which are needed if the jobs take long time to deserialize on slave)
• added DeleteJob to ClientService
• made optimizer actually Pause instead of Stop when stop is called explicitly (so they can be resumed later)
• temporarily disabled job-abortion from server because it aborted jobs which took too long to deserialize on slaves (this issue needs to be investigated)
• reduced locking of engines on slave so that the deserialization does not block heartbeats

#1347

• worked on HiveEngine
• added test project for HiveEngine

File:

• branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

@@ -141 +141 @@
             catch (AppDomainUnloadedException) {
               // appdomain already unloaded. Finishing job probably ongoing
-            }
-          else
+            } else
             Logger.Error("AbortJob: Engine doesn't exist");
           break;
@@ -291 +290 @@
 
         byte[] sJob = engines[jId].GetFinishedJob();
-        
+
         try {
           Logger.Info("Sending the finished job with id: " + jId);
@@ -384 +383 @@
             AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(e.Result.Obj.Id.ToString(), pluginDir, Path.Combine(pluginDir, PluginCache.ConfigFileName));
             appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-            lock (engines) {
-              if (!jobs.ContainsKey(e.Result.Obj.Id)) {
-                jobs.Add(e.Result.Obj.Id, e.Result.Obj);
-                appDomains.Add(e.Result.Obj.Id, appDomain);
-                Logger.Debug("Creating AppDomain");
-                Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+
+            if (!jobs.ContainsKey(e.Result.Obj.Id)) {
+              jobs.Add(e.Result.Obj.Id, e.Result.Obj);
+              appDomains.Add(e.Result.Obj.Id, appDomain);
+              Logger.Debug("Creating AppDomain");
+
+              Executor engine;
+              lock (engines) {
+                engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
                 Logger.Debug("Created AppDomain");
                 engine.JobId = e.Result.Obj.Id;
@@ -395 +397 @@
                 Logger.Debug("Starting Engine for job " + e.Result.Obj.Id);
                 engines.Add(e.Result.Obj.Id, engine);
-                engine.Start(e.Data);
-                SlaveStatusInfo.JobsFetched++;
-                Logger.Info("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
               }
+              SlaveStatusInfo.JobsFetched++;
+              Logger.Info("Increment FetchedJobs to:" + SlaveStatusInfo.JobsFetched);
+              engine.Start(e.Data);
             }
             heartbeatManager.AwakeHeartBeatThread();