Changeset 8945

Timestamp:

11/26/12 16:03:01 (11 years ago)

Author:

ascheibe

Message:

#1986 made the necessary changes on the server for shutting down slaves

Location:

branches/SlaveShutdown

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/Enums/DowntimeType.cs (added)
• HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Convert.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/Downtime.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/MessageContainer.cs (modified) (1 diff)

branches/SlaveShutdown/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

@@ -99 +99 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="Enums\Command.cs" />
+    <Compile Include="Enums\DowntimeType.cs" />
     <Compile Include="Enums\CpuArchitecture.cs" />
     <Compile Include="Plugin.cs" />
@@ -156 +157 @@
   </PropertyGroup>
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -162 +163 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

branches/SlaveShutdown/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

@@ -95 +95 @@
       <Column Name="Recurring" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
       <Column Name="RecurringId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
+      <Column Name="DowntimeType" Storage="_Type" Type="global::HeuristicLab.Services.Hive.DataAccess.DowntimeType" DbType="VarChar(MAX)" CanBeNull="false" />
       <Association Name="Resource_Downtime" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" />
     </Type>

branches/SlaveShutdown/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

@@ -3 +3 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -2153 +2153 @@
     private System.Guid _RecurringId;
     
+    private global::HeuristicLab.Services.Hive.DataAccess.DowntimeType _Type;
+    
     private EntityRef<Resource> _Resource;
     
@@ -2173 +2175 @@
     partial void OnRecurringIdChanging(System.Guid value);
     partial void OnRecurringIdChanged();
+    partial void OnDowntimeTypeChanging(global::HeuristicLab.Services.Hive.DataAccess.DowntimeType value);
+    partial void OnDowntimeTypeChanged();
     #endregion
     
@@ -2321 +2325 @@
           this.SendPropertyChanged("RecurringId");
           this.OnRecurringIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(MAX)", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.DataAccess.DowntimeType DowntimeType
+    {
+      get
+      {
+        return this._Type;
+      }
+      set
+      {
+        if ((this._Type != value))
+        {
+          this.OnDowntimeTypeChanging(value);
+          this.SendPropertyChanging();
+          this._Type = value;
+          this.SendPropertyChanged("DowntimeType");
+          this.OnDowntimeTypeChanged();
         }
       }

branches/SlaveShutdown/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql

@@ -75 +75 @@
   [Recurring] Bit NOT NULL,
   [RecurringId] UniqueIdentifier NOT NULL,
+  [DowntimeType] VarChar(MAX) NOT NULL,
   CONSTRAINT [PK_dbo.Downtime] PRIMARY KEY ([DowntimeId])
   )

branches/SlaveShutdown/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -118 +118 @@
     public static DT.Downtime ToDto(DB.Downtime source) {
       if (source == null) return null;
-      return new DT.Downtime { Id = source.DowntimeId, AllDayEvent = source.AllDayEvent, EndDate = source.EndDate, Recurring = source.Recurring, RecurringId = source.RecurringId, ResourceId = source.ResourceId, StartDate = source.StartDate };
+      return new DT.Downtime { Id = source.DowntimeId, AllDayEvent = source.AllDayEvent, EndDate = source.EndDate, Recurring = source.Recurring, RecurringId = source.RecurringId, ResourceId = source.ResourceId, StartDate = source.StartDate, DowntimeType = source.DowntimeType };
     }
     public static DB.Downtime ToEntity(DT.Downtime source) {
@@ -127 +127 @@
     public static void ToEntity(DT.Downtime source, DB.Downtime target) {
       if ((source != null) && (target != null)) {
-        target.DowntimeId = source.Id; target.AllDayEvent = source.AllDayEvent; target.EndDate = source.EndDate; target.Recurring = source.Recurring; target.RecurringId = source.RecurringId; target.ResourceId = source.ResourceId; target.StartDate = source.StartDate;
+        target.DowntimeId = source.Id; target.AllDayEvent = source.AllDayEvent; target.EndDate = source.EndDate; target.Recurring = source.Recurring; target.RecurringId = source.RecurringId; target.ResourceId = source.ResourceId; target.StartDate = source.StartDate; target.DowntimeType = source.DowntimeType;
       }
     }

branches/SlaveShutdown/HeuristicLab.Services.Hive/3.3/DataTransfer/Downtime.cs

@@ -22 +22 @@
 using System;
 using System.Runtime.Serialization;
+using HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive.DataTransfer {
@@ -38 +39 @@
     [DataMember]
     public Guid ResourceId { get; set; }
+    [DataMember]
+    public DowntimeType DowntimeType { get; set; }
   }
 }

branches/SlaveShutdown/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -47 +47 @@
         if (heartbeat.HbInterval != slave.HbInterval) {
           actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
+        }
+        if (ShutdownSlaveComputer(slave.Id)) {
+          actions.Add(new MessageContainer(MessageContainer.MessageType.ShutdownComputer));
         }
 
@@ -147 +150 @@
     private bool SlaveIsAllowedToCalculate(Guid slaveId) {
       // the slave may only calculate if there is no downtime right now. this needs to be checked for every parent resource also
-      return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() == 0);
+      return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Offline && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() == 0);
+    }
+
+    private bool ShutdownSlaveComputer(Guid slaveId) {
+      return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Shutdown && DateTime.Now >= x.StartDate).Count() != 0);
     }
   }

branches/SlaveShutdown/HeuristicLab.Services.Hive/3.3/MessageContainer.cs

@@ -48 +48 @@
       ShutdownSlave,  // slave should shutdown immediately without submitting results
       SayHello,  // Slave should say hello, because job is unknown to the server
-      NewHBInterval,
+      NewHBInterval, // change the polling to a new interval
+      ShutdownComputer, // shutdown the computer the slave runs on
     };