Changeset 5404 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave

Timestamp:

02/01/11 15:51:11 (14 years ago)

Author:

cneumuel

Message:

#1233

• changed the workflow of aquireing a new job from server.
  • if a job is available for calculation, the slave receives the jobId already with the heartbeats. The job is then exclusively assigned to this slave.
• extended the metainfo for a slave by OperatingSystem and CpuArchitecture
• enhanced the way plugin-dependencies are discovered by using the types used by XmlGenerator. Now only mimimum amount of plugins are transferred.
• selection of waiting jobs now consideres assigned slave-group
• more unit tests for service
• added unit tests for experiment manager

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• ConfigManager.cs (modified) (5 diffs)
• Core.cs (modified) (1 diff)
• HeartbeatManager.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• WcfService.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/ConfigManager.cs

@@ -26 +26 @@
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Clients.Hive.Slave.Properties;
+using System.Management;
+using System.Diagnostics;
 
 
@@ -44 +46 @@
 
     public Core Core { get; set; }
-    private HeuristicLab.Services.Hive.Common.DataTransfer.Slave hardwareInfo;
-
+    private HeuristicLab.Services.Hive.Common.DataTransfer.Slave slave;
+    
     /// <summary>
     /// Constructor for the singleton, must recover Guid, Calendar, ...
     /// </summary>
     private ConfigManager() {
-      hardwareInfo = new HeuristicLab.Services.Hive.Common.DataTransfer.Slave();
-
-      if (Settings.Default.Guid == Guid.Empty) {
-        hardwareInfo.Id = Guid.NewGuid();
-        Settings.Default.Guid = hardwareInfo.Id;
-        Settings.Default.Save();
-      } else
-        hardwareInfo.Id = Settings.Default.Guid;
-
-      hardwareInfo.Cores = Environment.ProcessorCount;
-      hardwareInfo.Memory = 1024;
-      hardwareInfo.Name = Environment.MachineName;
+      slave = new HeuristicLab.Services.Hive.Common.DataTransfer.Slave();
+      slave.Id = GetUniqueMachineId();
+      slave.Name = Environment.MachineName;
+      slave.Cores = Environment.ProcessorCount;
+      slave.Memory = GetPhysicalMemory();
+      slave.CpuArchitecture = Environment.Is64BitOperatingSystem ? CpuArchitecture.x64 : CpuArchitecture.x86;
+      slave.OperatingSystem = Environment.OSVersion.VersionString;
     }
 
@@ -71 +68 @@
       //TODO: how to display connectedsince in gui?
       //hardwareInfo.Login = WcfService.Instance.ConnectedSince;
-      return hardwareInfo;
+      return slave;
     }
 
@@ -81 +78 @@
       //Todo: Locking
       StatusCommons st = new StatusCommons();
-      st.ClientGuid = hardwareInfo.Id;
+      st.ClientGuid = slave.Id;
 
       st.Status = WcfService.Instance.ConnState;
       st.ConnectedSince = WcfService.Instance.ConnectedSince;
 
-      st.TotalCores = hardwareInfo.Cores.HasValue ? hardwareInfo.Cores.Value : 0;
-      st.FreeCores = hardwareInfo.Cores.HasValue ? hardwareInfo.Cores.Value - GetUsedCores() : 0;
+      st.TotalCores = slave.Cores.HasValue ? slave.Cores.Value : 0;
+      st.FreeCores = slave.Cores.HasValue ? slave.Cores.Value - GetUsedCores() : 0;
 
       st.JobsAborted = SlaveStatusInfo.JobsAborted;
@@ -128 +125 @@
     }
 
+    public static Guid GetUniqueMachineId() {
+      // todo: instead of creating a new id, generate an ID from hardware IDs which is always the same for one machine
+      if (Settings.Default.Guid == Guid.Empty) {
+        Guid id = Guid.NewGuid();
+        Settings.Default.Guid = id;
+        Settings.Default.Save();
+        return id;
+      } else
+        return Settings.Default.Guid;
+    }
+
+    public static int GetPhysicalMemory() {
+      return 1024; // todo
+    }
+
+    public static int GetFreeMemory() {
+      PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
+      int mb = (int)(counter.NextValue() / 1024 / 1024);
+      return mb;
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -153 +153 @@
 
           //Pull a Job from the Server
-          case MessageContainer.MessageType.AquireJob:
-            Job myJob = wcfService.AquireJob();
+          case MessageContainer.MessageType.CalculateJob:
+            Job myJob = wcfService.GetJob(container.JobId);
             //TODO: handle in own thread!!
             JobData jobData = wcfService.GetJobData(myJob.Id);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs

@@ -93 +93 @@
                 SlaveId = info.Id, /*Settings.Default.Guid*/
                 FreeCores = info.Cores.HasValue ? info.Cores.Value - ConfigManager.Instance.GetUsedCores() : 0,
-                FreeMemory = GetFreeMemory(),
+                FreeMemory = ConfigManager.GetFreeMemory(),
                 JobProgress = ConfigManager.Instance.GetExecutionTimeOfAllJobs()
               };
@@ -129 +129 @@
     }
     #endregion
-
-    #region Helpers
-    private int GetFreeMemory() {
-      PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
-      int mb = (int)(counter.NextValue() / 1024 / 1024);
-      return mb;
-    }
-    #endregion
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -88 +88 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

@@ -113 +113 @@
 
     /// <summary>
-    /// Aquire a Job from the Server, return the Job
-    /// </summary>
-    public Job AquireJob() {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
-        try {
-          Job job = service.Obj.AquireJob(Settings.Default.Guid);
+    /// Get a Job from the Server
+    /// </summary>
+    public Job GetJob(Guid jobId) {
+      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+        try {
+          Job job = service.Obj.GetJob(jobId);
           return job;
         }