Changeset 5511 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests

Timestamp:

02/17/11 14:47:56 (13 years ago)

Author:

cneumuel

Message:

#1233

• added StateLog to log state transitions of hive jobs
• added permissions to hive experiments (in data access layer, no UI for that yet)
• extended unit tests

Location:

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

Files:

• DaoTests.cs (modified) (5 diffs)
• ServiceTests.cs (modified) (9 diffs)

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

@@ -1 +1 @@
 using System;
-using System.Text;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Clients.Hive.Slave.Tests;
-using HeuristicLab.Clients.Hive;
 using HeuristicLab.Services.Hive.DataAccess;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace HeuristicLab.Services.Hive.Tests {
-  using DA = HeuristicLab.Services.Hive.DataAccess;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
 
@@ -32 +27 @@
       
       DT.Job job1 = new DT.Job();
-      job1.DateCreated = DateTime.Now;
+      job1.SetState(JobState.Offline, Guid.NewGuid());
 
       DT.Plugin plugin1 = new DT.Plugin();
@@ -57 +52 @@
       Assert.AreEqual(job1.Id, job1loaded.Id);
       Assert.AreEqual(job1.CoresNeeded, job1loaded.CoresNeeded);
-      Assert.AreEqual(null, job1loaded.DateCalculated);
       Assert.AreEqual(job1.DateCreated.ToString(), job1loaded.DateCreated.ToString());
       Assert.AreEqual(null, job1loaded.DateFinished);
       Assert.IsTrue(job1.PluginsNeededIds.SequenceEqual(job1loaded.PluginsNeededIds));
-      
+      Assert.AreEqual(job1.StateLog.Count, job1loaded.StateLog.Count);
+      for (int i = 0; i < job1.StateLog.Count; i++) {
+        Assert.AreEqual(job1.Id, job1loaded.StateLog[i].JobId);
+        Assert.AreEqual(job1.StateLog[i].State, job1loaded.StateLog[i].State);
+        Assert.AreEqual(job1.StateLog[i].SlaveId, job1loaded.StateLog[i].SlaveId);
+        Assert.AreEqual(job1.StateLog[i].UserId, job1loaded.StateLog[i].UserId);
+        Assert.AreEqual(job1.StateLog[i].Exception, job1loaded.StateLog[i].Exception);
+        Assert.IsTrue(Math.Abs((job1.StateLog[i].DateTime - job1loaded.StateLog[i].DateTime).TotalSeconds) < 1);
+      }
+
       dao.DeleteJob(job1.Id);
 
@@ -96 +99 @@
       dao.DeleteSlave(slave.Id);
       dao.DeleteSlaveGroup(slaveGroup.Id);
-    }
-
-    [TestMethod]
-    public void TestJobDaoWaiting() {
-      IHiveDao dao = ServiceLocator.Instance.HiveDao;
-
-      DT.Job job = new DT.Job();
-      job.DateCreated = DateTime.Now;
-      job.JobState = JobState.Waiting;
-      job.Id = dao.AddJob(job);
-
-      // todo
     }
 
@@ -152 +143 @@
     }
 
+    [TestMethod]
+    public void TestHiveExperimentDao() {
+      IHiveDao dao = ServiceLocator.Instance.HiveDao;
+
+      DT.HiveExperiment he = new DT.HiveExperiment();
+
+      DT.Job job = new DT.Job();
+      job.SetState(JobState.Offline, Guid.NewGuid());
+      job.Id = dao.AddJob(job);
+
+      he.RootJobId = job.Id;
+      he.DateCreated = DateTime.Now;
+      he.Name = "TestExperiment";
+      he.OwnerUserId = Guid.NewGuid();
+      he.ResourceNames = "HEAL";
+
+      he.Id = dao.AddHiveExperiment(he);
+
+      DT.HiveExperimentPermission perm = new DT.HiveExperimentPermission();
+      perm.HiveExperimentId = he.Id;
+      perm.GrantedByUserId = he.OwnerUserId;
+      perm.GrantedUserId = Guid.NewGuid();
+      perm.Permission = Permission.Write;
+      dao.AddHiveExperimentPermission(perm);
+
+      DT.HiveExperiment heLoaded = dao.GetHiveExperiment(he.Id);
+      Assert.AreEqual(he.Id, heLoaded.Id);
+      Assert.AreEqual(he.Name, heLoaded.Name);
+      Assert.AreEqual(he.ResourceNames, heLoaded.ResourceNames);
+      Assert.AreEqual(he.RootJobId, heLoaded.RootJobId);
+      //Assert.AreEqual(he.LastAccessed, heLoaded.LastAccessed);
+      //Assert.AreEqual(he.DateCreated, heLoaded.DateCreated);
+      
+      DT.Job jobLoaded = dao.GetJob(he.RootJobId);
+      Assert.AreEqual(job.Id, jobLoaded.Id);
+      Assert.AreEqual(job.State, jobLoaded.State);
+
+      DT.HiveExperimentPermission permLoaded = dao.GetHiveExperimentPermission(he.Id, perm.GrantedUserId);
+      Assert.AreEqual(perm.HiveExperimentId, permLoaded.HiveExperimentId);
+      Assert.AreEqual(perm.GrantedUserId, permLoaded.GrantedUserId);
+      Assert.AreEqual(perm.GrantedByUserId, permLoaded.GrantedByUserId);
+      Assert.AreEqual(perm.Permission, permLoaded.Permission);
+
+      dao.DeleteHiveExperiment(he.Id);
+      Assert.AreEqual(null, dao.GetHiveExperiment(he.Id));
+      Assert.AreEqual(null, dao.GetJob(he.RootJobId));
+      Assert.AreEqual(null, dao.GetHiveExperimentPermission(perm.HiveExperimentId, perm.GrantedUserId));
+
+    }
   }
 }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Clients.Hive;
 using HeuristicLab.Clients.Hive.Slave.Tests;
+using HeuristicLab.Hive;
+using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 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.Diagnostics;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using System.Diagnostics;
 
   [TestClass]
@@ -54 +54 @@
       var service = GetLocalService();
 
+      // create hive experiment
       DT.HiveExperiment experiment = new DT.HiveExperiment() {
         Name = "TestExperiment",
@@ -59 +60 @@
       };
 
+      // create job
       DT.Job job = new DT.Job() {
         CoresNeeded = 1,
@@ -64 +66 @@
         Priority = 0
       };
+      job.SetState(JobState.Offline);
 
       DT.JobData jobData = new DT.JobData() {
-        Data = PersistenceUtil.Serialize(new MockJob(500, true))
+        //Data = PersistenceUtil.Serialize(new MockJob(500, true))
+        Data = new byte[10000000]
       };
 
+      // create plugin
       DT.Plugin plugin1 = new DT.Plugin();
       plugin1.Name = "Tests.MyPlugin";
@@ -77 +82 @@
 
       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 };
 
+      plugin1.Id = service.AddPlugin(plugin1, new List<PluginData> { pluginData1 });
+      pluginData1.PluginId = plugin1.Id;
+
+      // add plugin
       job.PluginsNeededIds.Add(plugin1.Id);
 
-      job.Id = service.AddJob(job, jobData, null);
+      // create slave
+      DT.Slave slave = new Slave();
+      slave.Id = Guid.NewGuid();
+      slave.Name = "TestSlave";
+      slave.Memory = 1024;
+      slave.Cores = 4;
+      slave.CpuSpeed = 2800;
+      slave.OperatingSystem = "Windows 3.11";
+      slave.CpuArchitecture = CpuArchitecture.x64;
+
+      // add slave
+      service.AddSlave(slave);
+
+      // add job
+      job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
       experiment.RootJobId = job.Id;
 
+      // add hive experiment
+      experiment.Id = service.AddHiveExperiment(experiment);
+
+      // test job
       DT.Job jobLoaded = service.GetJob(job.Id);
       Assert.AreEqual(job.Id, jobLoaded.Id);
@@ -91 +117 @@
       Assert.AreEqual(job.MemoryNeeded, jobLoaded.MemoryNeeded);
       Assert.AreEqual(job.Priority, jobLoaded.Priority);
-      Assert.AreEqual(JobState.Waiting, jobLoaded.JobState);
-      Assert.AreEqual(ServiceLocator.Instance.AuthorizationManager.UserId, job.UserId);
+      Assert.AreEqual(JobState.Waiting, jobLoaded.State);
       Assert.IsTrue(job.PluginsNeededIds.SequenceEqual(jobLoaded.PluginsNeededIds));
-
+      
       DT.JobData jobDataLoaded = service.GetJobData(job.Id);
       Assert.AreEqual(job.Id, jobDataLoaded.JobId);
       Assert.IsTrue(jobData.Data.SequenceEqual(jobDataLoaded.Data));
 
-      experiment.Id = service.AddHiveExperiment(experiment);
-
+      // test hive experiment
       DT.HiveExperiment experimentLoaded = service.GetHiveExperiment(experiment.Id);
       Assert.AreEqual(experiment.Id, experimentLoaded.Id);
@@ -107 +131 @@
       Assert.AreEqual(experiment.RootJobId, experimentLoaded.RootJobId);
 
+      // test assigned ressources
+      var 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);
+
+      jobLoaded = service.GetJob(job.Id);
+      Assert.AreEqual(JobState.Transferring, jobLoaded.State);
+
+      // send progress
+      var progress = new Dictionary<Guid, TimeSpan>();
+      progress.Add(job.Id, new TimeSpan(1, 5, 10, 20, 30));
+      actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 3, FreeMemory = 1024, JobProgress = progress });
+      Assert.AreEqual(0, actions.Count);
+
+      // the job should be in state 'Calculating' now
+      jobLoaded = service.GetJob(job.Id);
+      Assert.AreEqual(JobState.Calculating, jobLoaded.State);
+      Assert.AreEqual(new TimeSpan(1, 5, 10, 20, 30), jobLoaded.ExecutionTime.Value);
+
+      // delete
       service.DeleteHiveExperiment(experiment.Id);
       Assert.AreEqual(null, service.GetHiveExperiment(experiment.Id));
       Assert.AreEqual(null, service.GetJob(job.Id));
       Assert.AreEqual(null, service.GetJobData(job.Id));
+
+      // send another heartbeat with the deleted job; the server should command the abortion of the job
+      actions = service.Heartbeat(new Heartbeat() { SlaveId = slave.Id, AssignJob = true, FreeCores = 3, FreeMemory = 1024, JobProgress = progress });
+      Assert.AreEqual(1, actions.Count);
+      Assert.AreEqual(MessageContainer.MessageType.AbortJob, actions[0].Message);
+      Assert.AreEqual(job.Id, actions[0].JobId);
+
+      // delete slave
+      service.DeleteSlave(slave.Id);
     }
 
@@ -185 +239 @@
         Thread.Sleep(500);
         lightweightJobs = service.GetLightweightJobs(jobs.Select(x => x.Id));
-      } while (!lightweightJobs.All(x => x.JobState == JobState.Finished));
+      } while (!lightweightJobs.All(x => x.State == JobState.Finished));
 
       // delete slaves
@@ -239 +293 @@
             IJob deserializedJob = PersistenceUtil.Deserialize<IJob>(jobData.Data);
             deserializedJob.Start();
-            job.JobState = JobState.Finished;
-            jobs.Where(x => x.Id == job.Id).Single().JobState = JobState.Finished;
+            job.SetState(JobState.Finished);
+            jobs.Where(x => x.Id == job.Id).Single().SetState(JobState.Finished);
             jobData.Data = PersistenceUtil.Serialize(deserializedJob);
-            service.UpdateJob(job, jobData);
+            service.UpdateJobData(job, jobData);
             Debug.WriteLine("finished calculating");
           }