Changeset 6039 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Timestamp:

04/22/11 10:58:01 (13 years ago)

Author:

cneumuel

Message:

#1233

• small fixes

Location:

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

Files:

• Core.cs (modified) (3 diffs)
• app.config (modified) (2 diffs)

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

@@ -166 +166 @@
               SlaveStatusInfo.JobsFetched++;
               job = wcfService.UpdateJobState(job.Id, JobState.Calculating, null);
+              if (job == null) throw new JobNotFoundException(jobId);
               StartJobInAppDomain(job, jobData);
             }, container.JobId)
@@ -429 +430 @@
     }
 
+    private static object locker = new object();
+
     /// <summary>
     /// A new Job from the wcfService has been received and will be started within a AppDomain.
@@ -435 +438 @@
       clientCom.LogMessage("Received new job with id " + myJob.Id);
       clientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
-      if (engines.ContainsKey(myJob.Id))
-        throw new Exception("Job with key " + myJob.Id + " already exists");
-
-      String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString());
-      bool pluginsPrepared = false;
-      string configFileName = string.Empty;
-
-      try {
-        PluginCache.Instance.PreparePlugins(myJob, out configFileName);
-        clientCom.LogMessage("Plugins fetched for job " + myJob.Id);
-        pluginsPrepared = true;
-      }
-      catch (Exception exception) {
-        clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
-        lock (engines) {
-          if (jobs.ContainsKey(myJob.Id)) {
-            jobs.Remove(myJob.Id);
-          }
-        }
-      }
-
-      if (pluginsPrepared) {
+
+      lock (locker) {
+        if (engines.ContainsKey(myJob.Id))
+          throw new Exception("Job with key " + myJob.Id + " already exists");
+
+        String pluginDir = Path.Combine(PluginCache.Instance.PluginTempBaseDir, myJob.Id.ToString());
+        bool pluginsPrepared = false;
+        string configFileName = string.Empty;
+
         try {
-          AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
-          appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
+          PluginCache.Instance.PreparePlugins(myJob, out configFileName);
+          clientCom.LogMessage("Plugins fetched for job " + myJob.Id);
+          pluginsPrepared = true;
+        }
+        catch (Exception exception) {
+          clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
           lock (engines) {
-            appDomains.Add(myJob.Id, appDomain);
-            clientCom.LogMessage("Creating AppDomain");
-            Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-            clientCom.LogMessage("Created AppDomain");
-            engine.JobId = myJob.Id;
-            engine.Core = this;
-            clientCom.LogMessage("Starting Engine for job " + myJob.Id);
-            engines.Add(myJob.Id, engine);
-            engine.Start(jobData.Data);
-          }
-        }
-        catch (Exception exception) {
-          clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id);
-          clientCom.LogMessage("Error thrown is: " + exception.ToString());
-          KillAppDomain(myJob.Id);
+            if (jobs.ContainsKey(myJob.Id)) {
+              jobs.Remove(myJob.Id);
+            }
+          }
+        }
+
+        if (pluginsPrepared) {
+          try {
+            AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+            appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);
+            lock (engines) {
+              appDomains.Add(myJob.Id, appDomain);
+              clientCom.LogMessage("Creating AppDomain");
+              Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
+              clientCom.LogMessage("Created AppDomain");
+              engine.JobId = myJob.Id;
+              engine.Core = this;
+              clientCom.LogMessage("Starting Engine for job " + myJob.Id);
+              engines.Add(myJob.Id, engine);
+              engine.Start(jobData.Data);
+            }
+          }
+          catch (Exception exception) {
+            clientCom.LogMessage("Creating the Appdomain and loading the job failed for job " + myJob.Id);
+            clientCom.LogMessage("Error thrown is: " + exception.ToString());
+            KillAppDomain(myJob.Id);
+          }
         }
       }

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

@@ -17 +17 @@
     <bindings>
       <wsHttpBinding>
-        <binding name="wsHttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+        <binding name="wsHttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
           <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
@@ -28 +28 @@
     </bindings>
     <services>
-      <service name="HeuristicLab.Clients.Hive.Slave.SlaveCommunicationService">        
-        <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.Slave.ServiceContracts.ISlaveCommunication"/>
+      <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService">        
+        <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
       </service>
     </services>
     <client>
-      <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService">
+      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
+      <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
         </identity>
       </endpoint>