Changeset 7020


Ignore:
Timestamp:
11/18/11 18:34:55 (8 years ago)
Author:
ascheibe
Message:

#1672

  • increased max. object graph size which can be serialized to allow downloading of big jobs
  • removed more magic numbers
  • increased job polling interval
Location:
trunk/sources
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config

    r6983 r7020  
    66 
    77  <system.serviceModel>
     8    <behaviors>
     9      <endpointBehaviors>
     10        <behavior name="HiveBehaviorConfiguration">
     11          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
     12        </behavior>
     13      </endpointBehaviors>
     14    </behaviors>
    815    <bindings>
    916      <wsHttpBinding>
     
    3138              bindingConfiguration="wsHttpBinding_Hive"
    3239              contract="HeuristicLab.Clients.Hive.IHiveService"
    33               name="wsHttpBinding_IHiveService">
     40              name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    3441      <identity>
    3542        <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r7014 r7020  
    1515 
    1616  <system.serviceModel>
     17    <behaviors>
     18      <endpointBehaviors>
     19        <behavior name="HiveBehaviorConfiguration">
     20          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
     21        </behavior>
     22      </endpointBehaviors>
     23    </behaviors>
    1724    <bindings>
    1825      <wsHttpBinding>
     
    3441    <client>
    3542      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    36       <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
     43      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    3744        <identity>
    3845          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r6994 r7020  
    9898    <Compile Include="StateLogList.cs" />
    9999    <Compile Include="StateLogListList.cs" />
    100     <None Include="app.config" />
     100    <None Include="app.config">
     101      <SubType>Designer</SubType>
     102    </None>
    101103    <None Include="Plugin.cs.frame" />
    102104    <Compile Include="Exceptions\AddTaskToHiveException.cs" />
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

    r6994 r7020  
    194194      this.Job = new Job();
    195195      this.log = new ThreadSafeLog();
    196       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
     196      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
    197197      this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
    198198      this.HiveTasks = new ItemCollection<HiveTask>();
     
    202202      this.Job = hiveExperiment;
    203203      this.log = new ThreadSafeLog();
    204       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
     204      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
    205205      this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
    206206      this.HiveTasks = new ItemCollection<HiveTask>();
     
    212212      this.log = cloner.Clone(original.log);
    213213      this.RefreshAutomatically = false; // do not start results polling automatically
    214       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
     214      this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
    215215      this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
    216216      this.HiveTasks = cloner.Clone(original.HiveTasks);
     
    230230    public void StartResultPolling() {
    231231      if (jobResultPoller == null) {
    232         jobResultPoller = new JobResultPoller(job.Id, /*ApplicationConstants.ResultPollingInterval*/new TimeSpan(0, 0, 5)); //TODO: find a better place for ApplicationConstants
     232        jobResultPoller = new JobResultPoller(job.Id, Settings.Default.ResultPollingInterval);
    233233        RegisterResultPollingEvents();
    234234        jobResultPoller.AutoResumeOnException = true;
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs

    r6976 r7020  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.235
     4//     Runtime Version:4.0.30319.239
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    4141            }
    4242        }
     43       
     44        [global::System.Configuration.ApplicationScopedSettingAttribute()]
     45        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     46        [global::System.Configuration.DefaultSettingValueAttribute("00:00:10")]
     47        public global::System.TimeSpan ResultPollingInterval {
     48            get {
     49                return ((global::System.TimeSpan)(this["ResultPollingInterval"]));
     50            }
     51        }
     52       
     53        [global::System.Configuration.ApplicationScopedSettingAttribute()]
     54        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     55        [global::System.Configuration.DefaultSettingValueAttribute("2")]
     56        public int MaxParallelDownloads {
     57            get {
     58                return ((int)(this["MaxParallelDownloads"]));
     59            }
     60        }
    4361    }
    4462}
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/Settings.settings

    r6976 r7020  
    99      <Value Profile="(Default)">HeuristicLab 3.3.exe</Value>
    1010    </Setting>
     11    <Setting Name="ResultPollingInterval" Type="System.TimeSpan" Scope="Application">
     12      <Value Profile="(Default)">00:00:10</Value>
     13    </Setting>
     14    <Setting Name="MaxParallelDownloads" Type="System.Int32" Scope="Application">
     15      <Value Profile="(Default)">2</Value>
     16    </Setting>
    1117  </Settings>
    1218</SettingsFile>
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

    r6976 r7020  
    5151      }
    5252    }
    53    
     53
    5454    public int FinishedCount {
    5555      get {
     
    6666    public TaskDownloader(IEnumerable<Guid> jobIds) {
    6767      this.taskIds = jobIds;
    68       this.taskDownloader = new ConcurrentTaskDownloader<ItemTask>(2, 2);
     68      this.taskDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
    6969      this.taskDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(taskDownloader_ExceptionOccured);
    7070      this.results = new Dictionary<Guid, HiveTask>();
    7171    }
    72    
     72
    7373    public void StartAsync() {
    7474      foreach (Guid taskId in taskIds) {
     
    8888            }
    8989          });
    90       }     
     90      }
    9191    }
    9292
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/app.config

    r6976 r7020  
    1414        <value>HeuristicLab 3.3.exe</value>
    1515      </setting>
     16      <setting name="ResultPollingInterval" serializeAs="String">
     17        <value>00:00:10</value>
     18      </setting>
     19      <setting name="MaxParallelDownloads" serializeAs="String">
     20        <value>2</value>
     21      </setting>
    1622    </HeuristicLab.Clients.Hive.Settings>
    1723  </applicationSettings>
    1824  <system.serviceModel>
     25    <behaviors>
     26      <endpointBehaviors>
     27        <behavior name="HiveBehaviorConfiguration">
     28          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
     29        </behavior>
     30      </endpointBehaviors>
     31    </behaviors>
    1932    <bindings>
    2033      <wsHttpBinding>
     
    4861    </bindings>
    4962    <client>
    50       <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
     63      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">
    5164        <identity>
    5265          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
Note: See TracChangeset for help on using the changeset viewer.