Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/14/10 16:52:55 (14 years ago)
Author:
cneumuel
Message:

#1233

  • made MockJob to execute asynchronously with the option to spinWait
  • added methods to IHiveService
  • implemented methods for Slave handling in HiveService
  • added more tests for server
  • changed db-schema of slaves and slavegroups
Location:
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperiment.cs

    r4796 r5106  
    3131    public Guid UserId { get; set; }
    3232    [DataMember]
    33     public Guid? RootJobId { get; set; }
     33    public Guid RootJobId { get; set; }
     34    [DataMember]
     35    public DateTime DateCreated { get; set; }
    3436
    3537    public HiveExperiment() { }
    … …  
    3739      this.RootJobId = original.RootJobId;
    3840      this.UserId = original.UserId;
     41      this.DateCreated = original.DateCreated;
    3942    }
    4043    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Job.cs

    r4905 r5106  
    3939    public int MemoryNeeded { get; set; }
    4040    [DataMember]
    41     public Guid? ProjectId { get; set; }
    42     [DataMember]
    4341    public List<Guid> PluginsNeededIds { get; set; }
    4442
    … …  
    4947      this.CoresNeeded = original.CoresNeeded;
    5048      this.MemoryNeeded = original.MemoryNeeded;
    51       this.ProjectId = original.ProjectId;
    5249      this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
    5350    }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/JobData.cs

    r4796 r5106  
    3333    [DataMember]
    3434    public byte[] Data { get; set; }
     35    [DataMember]
     36    public DateTime LastUpdate { get; set; }
    3537
    3638    public JobData() { }
    3739    protected JobData(JobData original, Cloner cloner) : base(original, cloner) {
    3840      if (original.Data != null) this.Data = new byte[original.Data.Length]; Array.Copy(original.Data, this.Data, original.Data.Length);
     41      this.LastUpdate = original.LastUpdate;
    3942    }
    4043    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/LightweightJob.cs

    r4796 r5106  
    3737    public String Exception { get; set; }
    3838    [DataMember]
    39     public DateTime? DateCreated { get; set; }
     39    public DateTime DateCreated { get; set; }
    4040    [DataMember]
    4141    public DateTime? DateCalculated { get; set; }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Resource.cs

    r4796 r5106  
    2828  [Serializable]
    2929  public class Resource : NamedHiveItem {
     30    [DataMember]
     31    public Guid? ParentResourceId { get; set; }
    3032
    3133    public Resource() { }
    32     protected Resource(Resource original, Cloner cloner) : base(original, cloner) { }
     34    protected Resource(Resource original, Cloner cloner) : base(original, cloner) {
     35      this.ParentResourceId = original.ParentResourceId;
     36    }
    3337    public override IDeepCloneable Clone(Cloner cloner) {
    3438      return new Resource(this, cloner);

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/Slave.cs

    r4796 r5106  
    3333    public int? FreeCores { get; set; }
    3434    [DataMember]
    35     public int? CpuSpeed { get; set; }
     35    public int? CpuSpeed { get; set; } // MHz
    3636    [DataMember]
    37     public int? Memory { get; set; }
     37    public int? Memory { get; set; } // MB
    3838    [DataMember]
    39     public int? FreeMemory { get; set; }
     39    public int? FreeMemory { get; set; } // MB
    4040    [DataMember]
    4141    public SlaveState SlaveState { get; set; }
    42     [DataMember]
    43     public CalendarState CalendarSyncState { get; set; }
    44     [DataMember]
    45     public Guid? SlaveConfigId { get; set; }
    4642    [DataMember]
    4743    public bool IsAllowedToCalculate { get; set; }
    … …  
    5753      this.FreeMemory = original.FreeMemory;
    5854      this.SlaveState = original.SlaveState;
    59       this.CalendarSyncState = original.CalendarSyncState;
    60       this.SlaveConfigId = original.SlaveConfigId;
    6155      this.IsAllowedToCalculate = original.IsAllowedToCalculate;
    6256    }

  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/SlaveGroup.cs

    r4796 r5106  
    2929  [DataContract]
    3030  public class SlaveGroup : Resource {
    31     [DataMember]
    32     public List<Guid> ChildResourcesIds { get; set; }
    33     [DataMember]
    34     public List<Guid> ParentResourcesIds { get; set; }
    35 
    36     public SlaveGroup() {
    37       ChildResourcesIds = new List<Guid>();
    38     }
    39     protected SlaveGroup(SlaveGroup original, Cloner cloner) : base(original, cloner) {
    40       this.ChildResourcesIds = new List<Guid>(original.ChildResourcesIds);
    41       this.ParentResourcesIds = new List<Guid>(original.ParentResourcesIds);
    42     }
     31    public SlaveGroup() { }
     32    protected SlaveGroup(SlaveGroup original, Cloner cloner) : base(original, cloner) { }
    4333    public override IDeepCloneable Clone(Cloner cloner) {
    4434      return new SlaveGroup(this, cloner);
Note: See TracChangeset for help on using the changeset viewer.