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

Timestamp:

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

Author:

ascheibe

Message:

#1233 server can now control the slave heartbeat interval

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (2 diffs)

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);
+        }
+      }
     }