Changeset 8957 for trunk/sources/HeuristicLab.Services.Hive

Timestamp:

11/28/12 09:57:35 (12 years ago)

Author:

ascheibe

Message:

#1986 merged SlaveShutdown branch back into trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• 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)

trunk/sources/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;
       }
     }

trunk/sources/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; }
   }
 }

trunk/sources/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).Any(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Shutdown && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() != 0);
     }
   }

trunk/sources/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
     };