Changeset 5404 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

Timestamp:

02/01/11 15:51:11 (13 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

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs (modified) (8 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs

@@ -28 +28 @@
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading;
+using HeuristicLab.Hive;
+using HeuristicLab.Services.Hive.Common;
 
 namespace HeuristicLab.Services.Hive.Tests {
-  using System.Threading;
-  using HeuristicLab.Hive;
-  using HeuristicLab.Services.Hive.Common;
+
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
+  using System.Diagnostics;
 
   [TestClass]
@@ -66 +68 @@
         Data = PersistenceUtil.Serialize(new MockJob(500, true))
       };
+
+      DT.Plugin plugin1 = new DT.Plugin();
+      plugin1.Name = "Tests.MyPlugin";
+      plugin1.Version = new Version("1.0.0.0");
+      plugin1.UserId = Guid.Empty;
+      plugin1.IsLocal = true;
+      plugin1.DateCreated = DateTime.Now;
+
+      DT.PluginData pluginData1 = new DT.PluginData();
+      pluginData1.PluginId = plugin1.Id;
+      pluginData1.FileName = "Tests.MyPlugin-1.0.dll";
+      pluginData1.Data = new byte[] { 0, 1, 2, 3, 4, 5 };
+
+      job.PluginsNeededIds.Add(plugin1.Id);
 
       job.Id = service.AddJob(job, jobData, null);
@@ -77 +93 @@
       Assert.AreEqual(JobState.Waiting, jobLoaded.JobState);
       Assert.AreEqual(ServiceLocator.Instance.AuthorizationManager.UserId, job.UserId);
+      Assert.IsTrue(job.PluginsNeededIds.SequenceEqual(jobLoaded.PluginsNeededIds));
 
       DT.JobData jobDataLoaded = service.GetJobData(job.Id);
@@ -101 +118 @@
     public void TestHeartbeats() {
       var service = GetLocalService();
+      // check if group already exists and delete
+      var existingSlaveGroup = service.GetSlaveGroups().SingleOrDefault(g => g.Name == "TestGroup");
+      if (existingSlaveGroup != null) {
+        var slavesToDelete = service.GetSlaves().Where(s => s.ParentResourceId == existingSlaveGroup.Id);
+        foreach (var slave in slavesToDelete) service.DeleteSlave(slave.Id);
+        service.DeleteSlaveGroup(existingSlaveGroup.Id);
+      }
+
       Guid groupId = service.AddSlaveGroup(new SlaveGroup() { Name = "TestGroup", Description = "Used for unit tests" });
 
-      for (int i = 0; i < 2; i++) {
-        Job job = new Job() {
-          CoresNeeded = 1, MemoryNeeded = 0
-        };
-        JobData jobData = new JobData() { Data = PersistenceUtil.Serialize(new MockJob(500, false)) };
-        job.Id = service.AddJob(job, jobData, null);
-        jobs.Add(job);
-      }
-
+      // create slaves
       var slaves = new List<DT.Slave>();
       for (int i = 0; i < 1; i++) {
@@ -124 +141 @@
           FreeMemory = 3000
         };
+        // check if slave with this name already exists and delete
+        var existingSlave = service.GetSlaves().Where(s => s.Name == slave.Name).SingleOrDefault();
+        if (existingSlave != null) service.DeleteSlave(existingSlave.Id);
+
         slave.Id = service.AddSlave(slave);
         service.AddResourceToGroup(groupId, slave.Id);
@@ -129 +150 @@
       }
 
+      // create jobs with different group, they should not be assigned
+      existingSlaveGroup = service.GetSlaveGroups().SingleOrDefault(g => g.Name == "DummyGroup");
+      if (existingSlaveGroup != null) service.DeleteSlaveGroup(existingSlaveGroup.Id);
+
+      Guid dummyGroupId = service.AddSlaveGroup(new SlaveGroup() { Name = "DummyGroup", Description = "Used for unit tests; jobs from this group shall not be calculated" });
+      // create dummy jobs
+      var dummyJobs = new List<Job>();
+      for (int i = 0; i < 2; i++) {
+        Job job = new Job() {
+          CoresNeeded = 1, MemoryNeeded = 0
+        };
+        JobData jobData = new JobData() { Data = PersistenceUtil.Serialize(new MockJob(500, false)) };
+        job.Id = service.AddJob(job, jobData, new List<Guid> { dummyGroupId });
+        dummyJobs.Add(job);
+      }
+
+      // create jobs
+      for (int i = 0; i < 2; i++) {
+        Job job = new Job() {
+          CoresNeeded = 1, MemoryNeeded = 0
+        };
+        JobData jobData = new JobData() { Data = PersistenceUtil.Serialize(new MockJob(500, false)) };
+        job.Id = service.AddJob(job, jobData, new List<Guid> { groupId });
+        jobs.Add(job);
+      }
+
+      // send heartbeats
       foreach (var slave in slaves) {
         new Thread(new ParameterizedThreadStart(RunSlaveThread)).Start(slave);
       }
 
-      // send heartbeats
       IEnumerable<LightweightJob> lightweightJobs;
       do {
@@ -146 +193 @@
       }
 
-      // delete group
+      // delete groups
       service.DeleteSlaveGroup(groupId);
+      service.DeleteSlaveGroup(dummyGroupId);
 
       // delete jobs
       foreach (var job in jobs) {
+        service.DeleteJob(job.Id);
+      }
+
+      // delete dummy jobs
+      foreach (var job in dummyJobs) {
         service.DeleteJob(job.Id);
       }
@@ -161 +214 @@
         int freeCores = slave.Cores.Value;
 
-        var messages = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, FreeMemory = 2423, FreeCores = freeCores, JobProgress = new Dictionary<Guid, TimeSpan>() });
-        if (messages.Count == 0)
-          return; // no more jobs
-
-        Assert.IsTrue(messages.Where(x => x.Message == MessageContainer.MessageType.AbortJob).Count() == 0);
-        Assert.IsTrue(messages.Where(x => x.Message == MessageContainer.MessageType.SayHello).Count() == 0);
-        Assert.IsTrue(messages.Where(x => x.Message == MessageContainer.MessageType.PauseJob).Count() == 0);
-
-        if (messages.Where(x => x.Message == MessageContainer.MessageType.AquireJob).Count() > 0) {
-          Guid jobId = messages.Where(x => x.Message == MessageContainer.MessageType.AquireJob).SingleOrDefault().JobId;
-          service.AquireJob(jobId);
-          Job job = service.GetJob(jobId);
-          JobData jobData = service.GetJobData(jobId);
-          IJob deserializedJob = PersistenceUtil.Deserialize<IJob>(jobData.Data);
-          deserializedJob.Start();
-          job.JobState = JobState.Finished;
-          jobs.Where(x => x.Id == jobId).Single().JobState = JobState.Finished;
-          jobData.Data = PersistenceUtil.Serialize(deserializedJob);
-          service.UpdateJob(job, jobData);
+        for (int i = 0; i < 10; i++) {
+
+          var messages = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, FreeMemory = 2423, FreeCores = freeCores, JobProgress = new Dictionary<Guid, TimeSpan>() });
+          if (messages.Count == 0) {
+            Debug.WriteLine("No job available");
+            return; // no more jobs
+          }
+
+          Debug.WriteLine("Messages: {0}", string.Join(", ", messages.Select(m => m.Message)));
+
+          Assert.IsTrue(messages.Where(x => x.Message == MessageContainer.MessageType.AbortJob).Count() == 0);
+          Assert.IsTrue(messages.Where(x => x.Message == MessageContainer.MessageType.SayHello).Count() == 0);
+          Assert.IsTrue(messages.Where(x => x.Message == MessageContainer.MessageType.PauseJob).Count() == 0);
+
+          var calculateJobMessage = messages.Where(x => x.Message == MessageContainer.MessageType.CalculateJob).SingleOrDefault();
+          if (calculateJobMessage != null) {
+            if (!jobs.Select(j => j.Id).Contains(calculateJobMessage.JobId))
+              Assert.Fail("Got job which was not assigned to the slavegroup");
+
+            Debug.WriteLine("Job available, calculating");
+            Job job = service.GetJob(calculateJobMessage.JobId);
+
+            JobData jobData = service.GetJobData(job.Id);
+            IJob deserializedJob = PersistenceUtil.Deserialize<IJob>(jobData.Data);
+            deserializedJob.Start();
+            job.JobState = JobState.Finished;
+            jobs.Where(x => x.Id == job.Id).Single().JobState = JobState.Finished;
+            jobData.Data = PersistenceUtil.Serialize(deserializedJob);
+            service.UpdateJob(job, jobData);
+            Debug.WriteLine("finished calculating");
+          }
         }
       }