Context Navigation

Changeset 6897 for branches/HeuristicLab.Hive-3.4

Timestamp:

10/10/11 15:20:01 (13 years ago)

Author:

ascheibe

Message:

#1233

fixed bug that occurred when setting the Heartbeat Interval for a group of slaves
slave reports HbInterval now correct on first start

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

-                      r6893
+                      r6897
     void SlaveViewContent_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
       OnContentChanged();
+      if (e.PropertyName == "HbInterval") {
+        UpdateChildHbIntervall(slaveView.Content);
+      }
+    }
+    private void UpdateChildHbIntervall(Resource resource) {
+      foreach (Resource r in Content.Where(x => x.ParentResourceId == resource.Id)) {
+        r.HbInterval = resource.HbInterval;
+        if (r is SlaveGroup) {
+          UpdateChildHbIntervall(r);
+        }
+      }
+    }

r6893	r6897
124	124	Content.HbInterval = interval;
125	125	}
126		catch (Exception ex) {
	126	catch (Exception) {
127	127	MessageBox.Show("Please enter a numeric value for the Heartbeat Interval.", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
128		txtHbIntervall.Text = "0";
	128	txtHbIntervall.Text = "10";
129	129	}
130	130	}

-                      r6744
+                      r6897
       try {
         if (!System.Diagnostics.EventLog.SourceExists("HLHive")) {
           System.Diagnostics.EventLog.CreateEventSource("HLHive", "Slave");
+          System.Diagnostics.EventLog.CreateEventSource("HLHive", "HiveSlave");
+        }
         eventLog.Source = "HLHive";
         eventLog.Log = "Slave";
+        eventLog.Log = "HiveSlave";
+      }
       catch (Exception) { }

-                      r6725
+                      r6897
 using System.Linq;
 using System.Management;
+using HeuristicLab.Clients.Hive.SlaveCore.Properties;
 …
     public ConfigManager(TaskManager jobManager) {
       this.jobManager = jobManager;
+      UpdateSlaveInfo();
+    }
+    private void UpdateSlaveInfo() {
       cpuCounter = new PerformanceCounter();
       cpuCounter.CategoryName = "Processor";
 …
       slave.CpuSpeed = GetCpuSpeed();
       slave.FreeMemory = GetFreeMemory();
+      slave.HbInterval = (int)Settings.Default.HeartbeatInterval.TotalSeconds;
+    }
 …
     /// <returns>the ClientInfo object</returns>
     public Slave GetClientInfo() {
+      UpdateSlaveInfo();
       return slave;
+    }

-                      r6893
+                      r6897
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       trans.UseTransaction(() => {
+        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);
+        }
+      }
+        dao.UpdateSlaveGroup(slaveGroup);
+      });
+    }

Note: See TracChangeset for help on using the changeset viewer.