Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/13/11 00:32:48 (13 years ago)
Author:
ascheibe
Message:

#1233

  • increase timeout when sending (for sending large jobs/lot's of plugins)
  • handle failed GetPluginDatas() properly
Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r5826 r6008  
    449449      catch (Exception exception) {
    450450        clientCom.LogMessage(string.Format("Copying plugins for job {0} failed: {1}", myJob.Id, exception));
     451        lock (engines) {
     452          if (jobs.ContainsKey(myJob.Id)) {
     453            jobs.Remove(myJob.Id);
     454          }
     455        }
    451456      }
    452457

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs

    r6004 r6008  
    177177        IEnumerable<PluginData> pluginDatas = WcfService.Instance.GetPluginDatas(missingGuids);
    178178
    179         foreach (PluginData pluginData in pluginDatas) {
    180           string pluginDir = Path.Combine(PluginCacheDir, pluginData.PluginId.ToString());
    181 
    182           //put all files belonging to a plugin in the same directory
    183           SafelyCreateDirectory(pluginDir);
    184           File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(pluginData.FileName)), pluginData.Data);
    185         }
    186 
    187         DoUpdateRun();
    188         CopyPluginsForJob(requiredPlugins, myJob.Id, out configFileName);
     179        if (pluginDatas != null) {
     180          foreach (PluginData pluginData in pluginDatas) {
     181            string pluginDir = Path.Combine(PluginCacheDir, pluginData.PluginId.ToString());
     182
     183            //put all files belonging to a plugin in the same directory
     184            SafelyCreateDirectory(pluginDir);
     185            File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(pluginData.FileName)), pluginData.Data);
     186          }
     187
     188          DoUpdateRun();
     189          CopyPluginsForJob(requiredPlugins, myJob.Id, out configFileName);
     190        } else {
     191          configFileName = "";
     192        }
    189193      }
    190194    }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config

    r5711 r6008  
    1717    <bindings>
    1818      <wsHttpBinding>
    19         <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="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     19        <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">
    2020          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
    2121          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config

    r5711 r6008  
    1717    <bindings>
    1818      <wsHttpBinding>
    19         <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="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     19        <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">
    2020          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
    2121          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_services.config

    r5711 r6008  
    1717    <bindings>
    1818      <wsHttpBinding>
    19         <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="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     19        <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">
    2020          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
    2121          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
Note: See TracChangeset for help on using the changeset viewer.