Changeset 9637


Ignore:
Timestamp:
06/17/13 14:59:36 (6 years ago)
Author:
pfleck
Message:

#2030:
In HiveServiceLocator: added public properties for endpointRetries and workingEndpoint.
Changed Config default settings.
Changed wshttp encoding to text for backwards compatibility.

Location:
branches/HivePerformance/sources
Files:
10 edited

Legend:

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

    r9461 r9637  
    2020    <bindings>
    2121      <wsHttpBinding>
    22         <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     22        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    2323          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    2424          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.MultiSlavesRunner/3.3/app.config

    r9461 r9637  
    2525    <bindings>
    2626      <wsHttpBinding>
    27         <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     27        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    2828          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    2929          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
     
    8888    <HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings>
    8989      <setting name="NumberOfSlaves" serializeAs="String">
    90         <value>16</value>
     90        <value>2</value>
    9191      </setting>
    9292    </HeuristicLab.Clients.Hive.SlaveCore.MultiSlavesRunner.Properties.Settings>
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config

    r9461 r9637  
    1313    <bindings>
    1414      <wsHttpBinding>
    15         <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     15        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    1616          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    1717          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r9461 r9637  
    2424    <bindings>
    2525      <wsHttpBinding>
    26         <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     26        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    2727          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    2828          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs

    r9539 r9637  
    3535    }
    3636
     37    private HiveServiceLocator() {
     38    }
     39
    3740    private string username;
    3841    public string Username {
     
    4750    }
    4851
    49     private int endpointRetries;
     52    public int EndpointRetries { get; private set; }
    5053
    51     private string workingEndpoint;
     54    public string WorkingEndpoint { get; private set; }
    5255
    5356    private HiveServiceClient NewServiceClient() {
    54       if (endpointRetries >= Settings.Default.MaxEndpointRetries) {
    55         return CreateClient(workingEndpoint);
     57      if (EndpointRetries >= Settings.Default.MaxEndpointRetries) {
     58        return CreateClient(WorkingEndpoint);
    5659      }
    5760
     
    6366          var cl = CreateClient(endpointConfigurationName);
    6467          cl.Open();
    65           workingEndpoint = endpointConfigurationName;
     68          WorkingEndpoint = endpointConfigurationName;
    6669          return cl;
    6770        }
    6871        catch (Exception exc) {
    6972          exception = exc;
    70           endpointRetries++;
     73          EndpointRetries++;
    7174        }
    7275      }
    7376
    74       throw exception;
     77      throw exception ?? new Exception("No endpoint for Hive service found.");
    7578    }
    7679
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.Designer.cs

    r9461 r9637  
    2626        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    28         [global::System.Configuration.DefaultSettingValueAttribute("16")]
     28        [global::System.Configuration.DefaultSettingValueAttribute("2")]
    2929        public int MaxParallelUploads {
    3030            get {
     
    9393        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    9494        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    95         [global::System.Configuration.DefaultSettingValueAttribute("5")]
     95        [global::System.Configuration.DefaultSettingValueAttribute("3")]
    9696        public int MaxEndpointRetries {
    9797            get {
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/Settings.settings

    r9461 r9637  
    44  <Settings>
    55    <Setting Name="MaxParallelUploads" Type="System.Int32" Scope="Application">
    6       <Value Profile="(Default)">16</Value>
     6      <Value Profile="(Default)">2</Value>
    77    </Setting>
    88    <Setting Name="HLBinaryName" Type="System.String" Scope="Application">
     
    2929    </Setting>
    3030    <Setting Name="MaxEndpointRetries" Type="System.Int32" Scope="Application">
    31       <Value Profile="(Default)">5</Value>
     31      <Value Profile="(Default)">3</Value>
    3232    </Setting>
    3333  </Settings>
  • branches/HivePerformance/sources/HeuristicLab.Clients.Hive/3.3/app.config

    r9461 r9637  
    99    <HeuristicLab.Clients.Hive.Settings>
    1010      <setting name="MaxParallelUploads" serializeAs="String">
    11         <value>16</value>
     11        <value>2</value>
    1212      </setting>
    1313      <setting name="HLBinaryName" serializeAs="String">
     
    3636      </setting>
    3737      <setting name="MaxEndpointRetries" serializeAs="String">
    38         <value>5</value>
     38        <value>3</value>
    3939      </setting>
    4040    </HeuristicLab.Clients.Hive.Settings>
     
    5050    <bindings>
    5151      <wsHttpBinding>
    52         <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Mtom" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
     52        <binding name="wsHttpBinding_Hive" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:20:00" sendTimeout="00:20:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
    5353          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
    5454          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
  • branches/HivePerformance/sources/HeuristicLab.Services.Hive.SelfHost/3.3/App.config

    r9434 r9637  
    5959    <bindings>
    6060      <wsHttpBinding>
    61         <binding name="WSHttpBinding_IHiveService" messageEncoding="Mtom" receiveTimeout="00:15:00" sendTimeout="00:10:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
     61        <binding name="WSHttpBinding_IHiveService" messageEncoding="Text" receiveTimeout="00:15:00" sendTimeout="00:10:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    6262          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    6363          <security mode="Message">
  • branches/HivePerformance/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config

    r9460 r9637  
    5959    <bindings>
    6060      <wsHttpBinding>
    61         <binding name="WSHttpBinding_IHiveService" messageEncoding="Mtom" receiveTimeout="00:15:00" sendTimeout="00:10:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
     61        <binding name="WSHttpBinding_IHiveService" messageEncoding="Text" receiveTimeout="00:15:00" sendTimeout="00:10:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    6262          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    6363          <security mode="Message">
Note: See TracChangeset for help on using the changeset viewer.