Changeset 5078


Ignore:
Timestamp:
12/09/10 13:55:41 (10 years ago)
Author:
cneumuel
Message:

#1233

  • removed dash from solution file name
  • reorganized MessageContainer.MessageTypes
  • added server test project
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
12 added
3 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/app.config

    r4905 r5078  
    1515            </bindings>
    1616        <client>
    17             <endpoint address="http://localhost:9000/Hive-3.3" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService">
     17            <endpoint address="http://localhost:9000/Hive-3.4" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService">
    1818              <identity>
    1919                <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/MessageContainer.cs

    r4905 r5078  
    3434
    3535    public enum MessageType {
    36       FetchJob,
    37       AbortJob,
    38       JobAborted,
    39       FinishedJob,
    40       NoMessage,
    41       SnapshotReady,
    42       Shutdown,
    43       JobFailed,
    44       UptimeLimitDisconnect,
    45       UpdateCalendar,
    46       AddChildJob,
    47       PauseJob,
    48       GetChildJobs,
    49       DeleteChildJobs,
     36      // *** commands from hive server ***
     37      NoMessage, // do nothing
     38      AquireJob, // slave should aquire a new job (formerly FetchJob)
     39      StopJob,   // slave should stop the job and submit results
     40      AbortJob,  // slave should shut the job down immediately without submitting results
     41      PauseJob,  // pause the job and submit the results
     42      StopSlave,      // slave should stop all jobs, submit results and shut itself down
     43      ShutdownSlave,  // slave should shutdown immediately without submitting results
     44      SayHello,  // Slave should say hello, because he is unknown to the server
    5045
    51       /// <summary>
    52       /// Slave should add itself
    53       /// </summary>
    54       AddSlaveInfo
     46      // *** events from execution engine ***
     47      JobStopped,      // job finished, submit results, unload appdomain
     48      JobPaused,       // job paused, submit results, unload appdomain
     49      JobFailed,       // job failed with an exception. submit the results, unload appdomain
     50
     51      // *** commands from execution engine ***
     52      AddChildJob,     // adds a new child job for the provided jobId
     53      GetChildJobs,    // return all child jobs of the provided jobId
     54      DeleteChildJobs, // delete all child jobs of the provided jobId
    5555    };
    5656
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/HeuristicLab.Services.Hive.DataAccess-3.4.csproj

    r5055 r5078  
    116116    <ProjectReference Include="..\..\HeuristicLab.Services.Hive.Common\3.4\HeuristicLab.Services.Hive.Common-3.4.csproj">
    117117      <Project>{14424A16-48D4-445E-80BF-DDF617548BBB}</Project>
    118       <Name>HeuristicLab.Services.Hive.Common-3.3</Name>
     118      <Name>HeuristicLab.Services.Hive.Common-3.4</Name>
    119119    </ProjectReference>
    120120  </ItemGroup>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Tools/CreateHiveDatabaseApplication.cs

    r4905 r5078  
    2323
    2424namespace HeuristicLab.Services.Hive.DataAccess {
    25   [Application("Create Hive Database", "Creates new empty Hive Database.", true)]
     25  [Application("Create Hive-3.4 Database", "Creates new empty Hive Database.", true)]
    2626  class CreateHiveDatabaseApplication : ApplicationBase {
    2727
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/app.config

    r4615 r5078  
    55  <connectionStrings>
    66    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
    7         connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;"
     7        connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;"
    88        providerName="System.Data.SqlClient" />
    99  </connectionStrings>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config

    r4905 r5078  
    2828    </diagnostics>
    2929   
     30    <bindings>
     31      <wsHttpBinding>
     32        <binding name="WSHttpBinding_IHiveService" receiveTimeout="00:10:00"
     33          sendTimeout="00:10:00" maxBufferPoolSize="104857600" maxReceivedMessageSize="104857600">
     34          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
     35          <security mode="Message">
     36            <transport clientCredentialType="Certificate"/>
     37            <message clientCredentialType="UserName" />
     38          </security>
     39        </binding>
     40      </wsHttpBinding>
     41    </bindings>
    3042   
    31     <!-- TODO from here: -->
    3243    <behaviors>
    3344      <serviceBehaviors>
    34         <behavior>
     45        <behavior name="ServiceBehaviour_IHiveService">
    3546          <!-- To avoid disclosing metadata information, set the value below to false and remove the metadata endpoint above before deployment -->
    36           <serviceMetadata httpGetEnabled="true"/>
     47          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
    3748          <!-- To receive exception details in faults for debugging purposes, set the value below to true.  Set to false before deployment to avoid disclosing exception information -->
    38           <serviceDebug includeExceptionDetailInFaults="false"/>
     49          <serviceDebug httpHelpPageEnabled="true" includeExceptionDetailInFaults="true" />
     50          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" />
     51          <serviceCredentials>
     52            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
     53            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" />
     54          </serviceCredentials>
     55          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure" />
     56          <serviceThrottling maxConcurrentCalls="100" />
    3957        </behavior>
    4058      </serviceBehaviors>
    4159    </behaviors>
     60
     61    <services>
     62      <service behaviorConfiguration="ServiceBehaviour_IHiveService" name="HeuristicLab.Services.Hive.HiveService">
     63        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange" />
     64        <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" />
     65      </service>
     66    </services>
     67   
    4268    <serviceHostingEnvironment multipleSiteBindingsEnabled="true" />
    4369  </system.serviceModel>
     70 
    4471  <system.webServer>
    4572    <modules runAllManagedModulesForAllRequests="true"/>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Hive.cs

    r5028 r5078  
    129129      Slave slave = dao.GetSlave(heartbeat.SlaveId);
    130130      if (slave == null) {
    131         actions.Add(new MessageContainer(MessageContainer.MessageType.AddSlaveInfo));
     131        actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
    132132      } else {
    133133        heartbeats[heartbeat.SlaveId] = DateTime.Now;
    134134        actions.AddRange(UpdateJobs(heartbeat));
    135135
    136         //check if new Cal must be loaded
    137         if (slave.CalendarSyncState == CalendarState.Fetch || slave.CalendarSyncState == CalendarState.ForceFetch) {
    138           actions.Add(new MessageContainer(MessageContainer.MessageType.UpdateCalendar));
    139         }
    140 
    141136        if (this.IsAllowedToSendJobs() && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
    142137          var availableJobs = dao.GetWaitingJobs(slave);
    143138          if (availableJobs.Count() > 0) {
    144             actions.Add(new MessageContainer(MessageContainer.MessageType.FetchJob));
     139            actions.Add(new MessageContainer(MessageContainer.MessageType.AquireJob));
    145140          }
    146141        }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

    r5062 r5078  
    1717  /// Implementation of the Hive service (interface <see cref="IHiveService"/>).
    1818  /// </summary>
    19   [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
    2019  public class HiveService : IHiveService {
    2120    private DataAccess.IHiveDao dao {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/app.config

    r5028 r5078  
    6363        <host>
    6464          <baseAddresses>
    65             <add baseAddress="http://localhost:9000/Hive-3.3" />
     65            <add baseAddress="http://localhost:9000/Hive-3.4" />
    6666          </baseAddresses>
    6767        </host>
Note: See TracChangeset for help on using the changeset viewer.