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

Timestamp:

02/17/11 14:47:56 (14 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/3.4

Files:

• AuthorizationManager.cs (modified) (2 diffs)
• HeartbeatManager.cs (modified) (4 diffs)
• HiveService.cs (modified) (3 diffs)
• Interfaces/IAuthorizationManager.cs (modified) (1 diff)
• LifecycleManager.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/AuthorizationManager.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Security;
 using System.Web.Security;
@@ -35 +34 @@
     }
 
-    public void AuthorizeJobs(params Guid[] jobIds) {
-      if (!IsAuthorizedForJobs(jobIds)) {
-        throw new SecurityException("User '" + Identity.UserName + "' is not authorized to access job (Id: " + string.Join(", ", jobIds.Select(x => x.ToString()).ToArray()) + ")");
-      }
-    }
+    //public void AuthorizeJobs(params Guid[] jobIds) {
+    //  if (!IsAuthorizedForJobs(jobIds)) {
+    //    throw new SecurityException("User '" + Identity.UserName + "' is not authorized to access job (Id: " + string.Join(", ", jobIds.Select(x => x.ToString()).ToArray()) + ")");
+    //  }
+    //}
 
-    private bool IsAuthorizedForJobs(params Guid[] jobIds) {
-      return ServiceLocator.Instance.HiveDao.IsUserAuthorizedForJobs(UserId, jobIds);
-    }
+    //private bool IsAuthorizedForJobs(params Guid[] jobIds) {
+    //  return ServiceLocator.Instance.HiveDao.IsUserAuthorizedForJobs(UserId, jobIds);
+    //}
 
     public void Authorize(Guid userId) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeartbeatManager.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
@@ -54 +53 @@
 
     private void AssignJob(Slave slave, Job job) {
-      job.SlaveId = slave.Id;
-      job.JobState = JobState.Calculating; // Todo: Maybe use State = Transferring (?)
-      job.DateCalculated = DateTime.Now; // Todo: use statelog instead
+      job.SetState(JobState.Transferring, slave.Id, "");
       dao.UpdateJob(job);
       dao.UpdateSlave(slave);
@@ -79 +76 @@
           Logger.Error("Job does not exist in DB: " + jobProgress.Key);
         } else {
-          if (curJob.SlaveId == Guid.Empty || curJob.SlaveId != heartbeat.SlaveId) {
+          if (curJob.CurrentStateLog.SlaveId == Guid.Empty || curJob.CurrentStateLog.SlaveId != heartbeat.SlaveId) {
             // assigned slave does not match heartbeat
             actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
@@ -88 +85 @@
             curJob.LastHeartbeat = DateTime.Now;
 
-            if (curJob.JobState == JobState.Aborted) {
+            if (curJob.State == JobState.Aborted) {
               // a request to abort the job has been set
               actions.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
+            } else if (curJob.State != JobState.Calculating) {
+              // jobstate was 'Transferring' before, now calculating
+              curJob.SetState(JobState.Calculating, heartbeat.SlaveId, "");
             }
             dao.UpdateJob(curJob);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -33 +33 @@
     //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
-    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> slaveGroupIds) {
-      using (trans.OpenTransaction()) {
-        job.UserId = auth.UserId;
-        job.DateCreated = DateTime.Now;
-        job.JobState = JobState.Waiting;
+    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
+      using (trans.OpenTransaction()) {
+        job.SetState(JobState.Waiting, auth.UserId);
         job.Id = dao.AddJob(job);
         jobData.JobId = job.Id;
         jobData.LastUpdate = DateTime.Now;
-        if (slaveGroupIds != null) {
-          foreach (Guid slaveGroupId in slaveGroupIds) {
+        if (resourceIds != null) {
+          foreach (Guid slaveGroupId in resourceIds) {
             dao.AssignJobToResource(job.Id, slaveGroupId);
           }
@@ -80 +78 @@
     }
 
-    public void UpdateJob(Job job, JobData jobData) {
+    public void UpdateJob(Job job) {
+      using (trans.OpenTransaction()) {
+        dao.UpdateJob(job);
+      }
+    }
+
+    public void UpdateJobData(Job job, JobData jobData) {
       using (trans.OpenTransaction()) {
         jobData.LastUpdate = DateTime.Now;
@@ -122 +126 @@
 
     public HiveExperiment GetHiveExperiment(Guid id) {
-      return dao.GetHiveExperiments(x => x.UserId == auth.UserId && x.HiveExperimentId == id).FirstOrDefault();
+      return dao.GetHiveExperiments(x =>
+             x.HiveExperimentId == id
+          && (x.OwnerUserId == auth.UserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == auth.UserId) > 0)
+          ).FirstOrDefault();
     }
 
     public IEnumerable<HiveExperiment> GetHiveExperiments() {
-      return dao.GetHiveExperiments(x => x.UserId == auth.UserId);
+      return dao.GetHiveExperiments(x => x.OwnerUserId == auth.UserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == auth.UserId) > 0);
     }
 
     public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
       using (trans.OpenTransaction()) {
-        hiveExperimentDto.UserId = auth.UserId;
+        hiveExperimentDto.OwnerUserId = auth.UserId;
         hiveExperimentDto.DateCreated = DateTime.Now;
         return dao.AddHiveExperiment(hiveExperimentDto);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Interfaces/IAuthorizationManager.cs

@@ -33 +33 @@
     /// </summary>
     /// <exception cref="SecurityException">thrown when access denied</exception>
-    void AuthorizeJobs(params Guid[] jobId);
+    //void AuthorizeJobs(params Guid[] jobId);
 
     /// <summary>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Transactions;
+using HeuristicLab.Core;
 using HeuristicLab.Services.Hive.Common;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
-using HeuristicLab.Tracing;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Services.Hive {
@@ -27 +23 @@
 
     // Windows-Forms timer is single threaded, so callbacks will be synchron
-    System.Windows.Forms.Timer timer;
+    private System.Windows.Forms.Timer timer;
 
     public ExecutionState ExecutionState {
@@ -40 +36 @@
     public void Start() {
       if (ExecutionState == Core.ExecutionState.Stopped) {
-        this.timer.Interval = (int)new TimeSpan(0, 0, 10).TotalMilliseconds;
+        this.timer.Interval = (int)new TimeSpan(0, 0, 30).TotalMilliseconds;
         this.timer.Start();
       }
@@ -71 +67 @@
 
     private void AbortJobs(Guid slaveId) {
-      var jobs = dao.GetJobs(x => x.Slave.ResourceId == slaveId);
+      var jobs = dao.GetJobs(x => x.StateLogs.Last().SlaveId == slaveId);
       foreach (var j in jobs) {
-        j.JobState = JobState.Waiting;
+        j.StateLog.Add(new StateLog() { 
+          UserId = auth.UserId, 
+          State = JobState.Waiting,
+          JobId = j.Id,
+          DateTime = DateTime.Now,
+          Exception = "Slave timed out"
+        });
         dao.UpdateJob(j);
       }