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

Timestamp:

06/06/11 17:49:27 (13 years ago)

Author:

cneumuel

Message:

#1233

• added consideration of appointments in heartbeats
• code cleanup

File:

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

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

@@ -105 +105 @@
       job.HiveExperimentId = experiment.Id;
       job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
-      
+
       // test job
       DT.Job jobLoaded = service.GetJob(job.Id);
@@ -153 +153 @@
       Assert.AreEqual(1, jobsBySlave.Count());
       Assert.AreEqual(job.Id, jobsBySlave.Single().Id);
-      
+
       // set it to finished
       service.UpdateJobState(jobLoaded.Id, JobState.Finished, slave.Id, null, null);
 
-      // test if the job is returned for the resource
+      // test if the job is returned for the resource (it should not be)
       var jobsBySlave2 = service.GetJobsByResourceId(slave.Id);
       Assert.AreEqual(0, jobsBySlave2.Count());
+
+      // set job waiting again
+      service.UpdateJobState(job.Id, JobState.Waiting, null, null, string.Empty);
+
+      // get job again
+      actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 4, FreeMemory = 1024, JobProgress = new Dictionary<Guid, TimeSpan>() });
+      Assert.AreEqual(1, actions.Count);
+      Assert.AreEqual(MessageContainer.MessageType.CalculateJob, actions[0].Message);
+      Assert.AreEqual(job.Id, actions[0].JobId);
+
+      // create appointment which should make slave unavailable for calculation
+      Guid appointmentId = service.AddAppointment(new Appointment { ResourceId = slave.Id, StartDate = DateTime.Now - TimeSpan.FromMinutes(1), EndDate = DateTime.Now + TimeSpan.FromMinutes(1), Recurring = false });
+
+      progress.Clear();
+      progress.Add(job.Id, new TimeSpan(1, 5, 10, 20, 30));
+      actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 4, FreeMemory = 1024, JobProgress = new Dictionary<Guid, TimeSpan>() });
+      Assert.AreEqual(1, actions.Count);
+      Assert.AreEqual(MessageContainer.MessageType.PauseAll, actions[0].Message);
+      Assert.AreEqual(Guid.Empty, actions[0].JobId);
+
+      service.DeleteAppointment(appointmentId);
 
       // delete
@@ -177 +198 @@
     }
 
-    List<DT.Job> jobs = new List<DT.Job>();
-    
     [TestMethod]
     public void TestParentJobs() {
@@ -282 +301 @@
       service.DeleteSlave(slave.Id);
     }
-
-    //[TestMethod]
-    //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" });
-
-    //  // create slaves
-    //  var slaves = new List<DT.Slave>();
-    //  for (int i = 0; i < 1; i++) {
-    //    DT.Slave slave = new DT.Slave() {
-    //      Cores = 2,
-    //      Memory = 4096,
-    //      Name = "Slave " + i,
-    //      IsAllowedToCalculate = true,
-    //      SlaveState = DT.SlaveState.Idle,
-    //      CpuSpeed = 2800,
-    //      FreeCores = 2,
-    //      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);
-    //    slaves.Add(slave);
-    //  }
-
-    //  // 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);
-    //  }
-
-    //  IEnumerable<LightweightJob> lightweightJobs;
-    //  do {
-    //    Thread.Sleep(500);
-    //    lightweightJobs = service.GetLightweightJobs(jobs.Select(x => x.Id));
-    //  } while (!lightweightJobs.All(x => x.State == JobState.Finished));
-
-    //  // delete slaves
-    //  foreach (var slave in slaves) {
-    //    service.DeleteSlave(slave.Id);
-    //    Assert.AreEqual(null, service.GetSlave(slave.Id));
-    //  }
-
-    //  // 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);
-    //  }
-    //}
-
-    //public void RunSlaveThread(object slaveobj) {
-    //  try {
-    //    var service = GetLocalService();
-    //    Slave slave = (Slave)slaveobj;
-    //    int freeCores = slave.Cores.Value;
-
-    //    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.SetState(JobState.Finished);
-    //        jobs.Where(x => x.Id == job.Id).Single().SetState(JobState.Finished);
-    //        jobData.Data = PersistenceUtil.Serialize(deserializedJob);
-    //        service.UpdateJobData(job, jobData);
-    //        Debug.WriteLine("finished calculating");
-    //      }
-    //    }
-    //  }
-    //  catch (Exception e) {
-    //    Assert.Fail(e.Message, e);
-    //  }
-    //}
   }
 }