Changeset 6893 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

10/09/11 01:47:51 (13 years ago)

Author:

ascheibe

Message:

#1233 server can now control the slave heartbeat interval

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3

Files:

• Convert.cs (modified) (6 diffs)
• DataTransfer/Heartbeat.cs (modified) (1 diff)
• DataTransfer/Resource.cs (modified) (1 diff)
• HiveService.cs (modified) (2 diffs)
• Manager/HeartbeatManager.cs (modified) (1 diff)
• MessageContainer.cs (modified) (1 diff)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -217 +217 @@
         OperatingSystem = source.OperatingSystem,
         LastHeartbeat = source.LastHeartbeat,
-        CpuUtilization = source.CpuUtilization
+        CpuUtilization = source.CpuUtilization,
+        HbInterval = source.HbInterval
       };
     }
@@ -241 +242 @@
         target.LastHeartbeat = source.LastHeartbeat;
         target.CpuUtilization = source.CpuUtilization;
+        target.HbInterval = source.HbInterval;
       }
     }
@@ -248 +250 @@
     public static DT.SlaveGroup ToDto(DB.SlaveGroup source) {
       if (source == null) return null;
-      return new DT.SlaveGroup { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId };
+      return new DT.SlaveGroup { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId, HbInterval = source.HbInterval };
     }
     public static DB.SlaveGroup ToEntity(DT.SlaveGroup source) {
@@ -257 +259 @@
     public static void ToEntity(DT.SlaveGroup source, DB.SlaveGroup target) {
       if ((source != null) && (target != null)) {
-        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId;
+        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId; target.HbInterval = source.HbInterval;
       }
     }
@@ -265 +267 @@
     public static DT.Resource ToDto(DB.Resource source) {
       if (source == null) return null;
-      return new DT.Resource { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId };
+      return new DT.Resource { Id = source.ResourceId, Name = source.Name, ParentResourceId = source.ParentResourceId, HbInterval = source.HbInterval };
     }
     public static DB.Resource ToEntity(DT.Resource source) {
@@ -274 +276 @@
     public static void ToEntity(DT.Resource source, DB.Resource target) {
       if ((source != null) && (target != null)) {
-        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId;
+        target.ResourceId = source.Id; target.Name = source.Name; target.ParentResourceId = source.ParentResourceId; target.HbInterval = source.HbInterval;
       }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Heartbeat.cs

@@ -40 +40 @@
     [DataMember]
     public float CpuUtilization { get; set; }
+    [DataMember]
+    public int HbInterval { get; set; }
 
     public override string ToString() {

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

@@ -30 +30 @@
     public Guid? ParentResourceId { get; set; }
 
+    [DataMember]
+    public int HbInterval { get; set; }
+
     public Resource() { }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -446 +446 @@
 
     #region Slave Methods
+    public int GetNewHeartbeatInterval(Guid slaveId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Slave);
+      Slave s = dao.GetSlave(slaveId);
+      if (s != null) {
+        return s.HbInterval;
+      } else {
+        return -1;
+      }
+    }
+
     public Guid AddSlave(Slave slave) {
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
@@ -486 +496 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       trans.UseTransaction(() => {
-        dao.UpdateSlaveGroup(slaveGroup);
-      });
+        UpdateSlaveHBs(slaveGroup);
+      });
+    }
+
+    private void UpdateSlaveHBs(Resource r) {
+      foreach (Resource resource in dao.GetChildResources(r.Id)) {
+        if (resource is SlaveGroup) {
+          resource.HbInterval = r.HbInterval;
+          dao.UpdateSlaveGroup(resource as SlaveGroup);
+          UpdateSlaveHBs(resource);
+        } else if (resource is Slave) {
+          resource.HbInterval = r.HbInterval;
+          dao.UpdateSlave(resource as Slave);
+        }
+      }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -45 +45 @@
         actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
       } else {
+        Slave s = dao.GetSlave(heartbeat.SlaveId);
+        if (s != null) {
+          if (heartbeat.HbInterval != s.HbInterval) {
+            actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
+          }
+        }
+
         // update slave data
         slave.FreeCores = heartbeat.FreeCores;

branches/HeuristicLab.Hive-3.4/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,
     };
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -203 +203 @@
     [OperationContract]
     void TriggerEventManager(bool force);
+
+    [OperationContract]
+    int GetNewHeartbeatInterval(Guid slaveId);
     #endregion