Changeset 9363 for branches/OaaS/HeuristicLab.Services.Hive/3.3

Timestamp:

04/16/13 13:13:41 (11 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/Convert.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/Downtime.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/DataTransfer/UserPriority.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/UserPriority.cs)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (19 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (11 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (modified) (5 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/ITaskScheduler.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/ITaskScheduler.cs)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (10 diffs)
• HeuristicLab.Services.Hive/3.3/MessageContainer.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Scheduler (copied) (copied from trunk/sources/HeuristicLab.Services.Hive/3.3/Scheduler)
• HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Settings.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/app.config (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -79 +79 @@
       }
     }
+
+    public static void ToEntityTaskOnly(DT.Task source, DB.Task target) {
+      if ((source != null) && (target != null)) {
+        target.TaskId = source.Id;
+        target.CoresNeeded = source.CoresNeeded;
+        target.ExecutionTimeMs = source.ExecutionTime.TotalMilliseconds;
+        target.MemoryNeeded = source.MemoryNeeded;
+        target.ParentTaskId = source.ParentTaskId;
+        target.Priority = source.Priority;
+        target.LastHeartbeat = source.LastHeartbeat;
+        target.State = Convert.ToEntity(source.State);
+        target.IsParentTask = source.IsParentTask;
+        target.FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished;
+        target.Command = Convert.ToEntity(source.Command);
+        // RequiredPlugins are added by Dao
+        target.JobId = source.JobId;
+        target.IsPrivileged = source.IsPrivileged;
+      }
+    }
     #endregion
 
@@ -118 +137 @@
     public static DT.Downtime ToDto(DB.Downtime source) {
       if (source == null) return null;
-      return new DT.Downtime { Id = source.DowntimeId, AllDayEvent = source.AllDayEvent, EndDate = source.EndDate, Recurring = source.Recurring, RecurringId = source.RecurringId, ResourceId = source.ResourceId, StartDate = source.StartDate };
+      return new DT.Downtime { Id = source.DowntimeId, AllDayEvent = source.AllDayEvent, EndDate = source.EndDate, Recurring = source.Recurring, RecurringId = source.RecurringId, ResourceId = source.ResourceId, StartDate = source.StartDate, DowntimeType = source.DowntimeType };
     }
     public static DB.Downtime ToEntity(DT.Downtime source) {
@@ -127 +146 @@
     public static void ToEntity(DT.Downtime source, DB.Downtime target) {
       if ((source != null) && (target != null)) {
-        target.DowntimeId = source.Id; target.AllDayEvent = source.AllDayEvent; target.EndDate = source.EndDate; target.Recurring = source.Recurring; target.RecurringId = source.RecurringId; target.ResourceId = source.ResourceId; target.StartDate = source.StartDate;
+        target.DowntimeId = source.Id; target.AllDayEvent = source.AllDayEvent; target.EndDate = source.EndDate; target.Recurring = source.Recurring; target.RecurringId = source.RecurringId; target.ResourceId = source.ResourceId; target.StartDate = source.StartDate; target.DowntimeType = source.DowntimeType;
       }
     }
@@ -527 +546 @@
     }
     #endregion
+
+    #region UserPriority
+    public static DT.UserPriority ToDto(DB.UserPriority source) {
+      if (source == null) return null;
+      return new DT.UserPriority() { Id = source.UserId, DateEnqueued = source.DateEnqueued };
+    }
+    public static DB.UserPriority ToEntity(DT.UserPriority source) {
+      if (source == null) return null;
+      var entity = new DB.UserPriority(); ToEntity(source, entity);
+      return entity;
+    }
+    public static void ToEntity(DT.UserPriority source, DB.UserPriority target) {
+      if ((source != null) && (target != null)) {
+        target.UserId = source.Id;
+        target.DateEnqueued = source.DateEnqueued;
+      }
+    }
+    #endregion
   }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/DataTransfer/Downtime.cs

@@ -22 +22 @@
 using System;
 using System.Runtime.Serialization;
+using HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive.DataTransfer {
@@ -38 +39 @@
     [DataMember]
     public Guid ResourceId { get; set; }
+    [DataMember]
+    public DowntimeType DowntimeType { get; set; }
   }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -116 +116 @@
     <Compile Include="Convert.cs" />
     <Compile Include="DataTransfer\Command.cs" />
+    <Compile Include="DataTransfer\UserPriority.cs" />
     <Compile Include="DataTransfer\ResourcePermission.cs" />
     <Compile Include="DataTransfer\Downtime.cs" />
@@ -142 +143 @@
     <Compile Include="Interfaces\IConnectionProvider.cs" />
     <Compile Include="Interfaces\IHiveDao.cs" />
+    <Compile Include="Interfaces\ITaskScheduler.cs" />
+    <Compile Include="Scheduler\TaskInfoForScheduler.cs" />
+    <Compile Include="Scheduler\JobInfoForScheduler.cs" />
+    <Compile Include="Scheduler\RoundRobinTaskScheduler.cs" />
     <Compile Include="Settings.cs" />
     <None Include="app.config" />
@@ -199 +204 @@
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -205 +210 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
+using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
+using HeuristicLab.Services.Hive.Interfaces;
 using DT = HeuristicLab.Services.Hive.DataTransfer;
-using System.ServiceModel;
-using HeuristicLab.Services.Hive.Interfaces;
-using System.Data.Common;
-using System.Configuration;
 
 namespace HeuristicLab.Services.Hive.DataAccess {
   public class HiveDao : IHiveDao {
-    
+
     public HiveDataContext CreateContext(bool longRunning = false) {
       //var context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
@@ -38 +37 @@
       if (ConfigurationManager.ConnectionStrings[Settings.Default.HiveConnectionStringName] == null) {
         context = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
-      }
-      else {
+      } else {
         context = new HiveDataContext(provider.GetOpenConnection(Settings.Default.HiveConnectionStringName));
       }
@@ -93 +91 @@
     }
 
+    public IEnumerable<DT.LightweightTask> GetLightweightTasks(Expression<Func<Task, bool>> predicate) {
+      List<DT.LightweightTask> tasks = new List<DT.LightweightTask>();
+
+      using (var db = CreateContext()) {
+        var tasksQuery = db.Tasks.Where(predicate).Select(task => new { task.TaskId, task.ExecutionTimeMs, task.ParentTaskId, task.StateLogs, task.State, task.Command });
+        var taskDatasQuery = db.Tasks.Where(predicate).Where(task => task.JobData != null).Select(task => new { task.TaskId, task.JobData.LastUpdate });
+
+        foreach (var task in tasksQuery) {
+          DT.LightweightTask t = new DT.LightweightTask();
+          t.Id = task.TaskId;
+          t.ExecutionTime = TimeSpan.FromMilliseconds(task.ExecutionTimeMs);
+          t.ParentTaskId = task.ParentTaskId;
+          t.StateLog = task.StateLogs == null ? new List<DT.StateLog>() : task.StateLogs.Select(x => DataTransfer.Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList();
+          t.State = DataTransfer.Convert.ToDto(task.State);
+          t.Command = DataTransfer.Convert.ToDto(task.Command);
+          t.LastTaskDataUpdate = taskDatasQuery.Where(x => x.TaskId == task.TaskId).Count() > 0 ? taskDatasQuery.Select(x => x.LastUpdate).First() : DateTime.MinValue;
+          tasks.Add(t);
+        }
+      }
+      return tasks;
+    }
+
+    public IEnumerable<DT.LightweightTask> GetLightweightTasksWithoutStateLog(Expression<Func<Task, bool>> predicate) {
+      List<DT.LightweightTask> tasks = new List<DT.LightweightTask>();
+
+      using (var db = CreateContext()) {
+        var tasksQuery = db.Tasks.Where(predicate).Select(task => new { task.TaskId, task.ExecutionTimeMs, task.ParentTaskId, task.State, task.Command });
+        var taskDatasQuery = db.Tasks.Where(predicate).Where(task => task.JobData != null).Select(task => new { task.TaskId, task.JobData.LastUpdate });
+
+        foreach (var task in tasksQuery) {
+          DT.LightweightTask t = new DT.LightweightTask();
+          t.Id = task.TaskId;
+          t.ExecutionTime = TimeSpan.FromMilliseconds(task.ExecutionTimeMs);
+          t.ParentTaskId = task.ParentTaskId;
+          t.StateLog = new List<DT.StateLog>();
+          t.State = DataTransfer.Convert.ToDto(task.State);
+          t.Command = DataTransfer.Convert.ToDto(task.Command);
+          t.LastTaskDataUpdate = taskDatasQuery.Where(x => x.TaskId == task.TaskId).Count() > 0 ? taskDatasQuery.Select(x => x.LastUpdate).First() : DateTime.MinValue;
+          tasks.Add(t);
+        }
+      }
+      return tasks;
+    }
+
     public Guid AddTask(DT.Task dto) {
       return ExecuteWithContext<Guid>((db) => {
@@ -106 +148 @@
     }
 
-    public void UpdateTask(DT.Task dto) {
+    public void UpdateTaskAndPlugins(DT.Task dto) {
       ExecuteWithContext((db) => {
         var entity = db.Tasks.FirstOrDefault(x => x.TaskId == dto.Id);
@@ -118 +160 @@
         db.SubmitChanges();
       });
+    }
+
+    public void UpdateTaskAndStateLogs(DT.Task dto) {
+      using (var db = CreateContext()) {
+        var entity = db.Tasks.FirstOrDefault(x => x.TaskId == dto.Id);
+        if (entity == null) db.Tasks.InsertOnSubmit(DT.Convert.ToEntity(dto));
+        else DT.Convert.ToEntity(dto, entity);
+        db.SubmitChanges();
+      }
+    }
+
+    public void UpdateTask(DT.Task dto) {
+      using (var db = CreateContext()) {
+        db.DeferredLoadingEnabled = false;
+
+        var entity = db.Tasks.FirstOrDefault(x => x.TaskId == dto.Id);
+        if (entity == null) db.Tasks.InsertOnSubmit(DT.Convert.ToEntity(dto));
+        else DT.Convert.ToEntityTaskOnly(dto, entity);
+        db.SubmitChanges();
+      }
     }
 
@@ -156 +218 @@
     }
 
-    public IEnumerable<DT.Task> GetWaitingTasks(DT.Slave slave, int count) {
-      return ExecuteWithContext<IEnumerable<DT.Task>>((db) => {
+    public IEnumerable<TaskInfoForScheduler> GetWaitingTasks(DT.Slave slave) {
+      return ExecuteWithContext<IEnumerable<TaskInfoForScheduler>>((db) => {
         var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
         //Originally we checked here if there are parent tasks which should be calculated (with GetParentTasks(resourceIds, count, false);).
@@ -169 +231 @@
                        && ar.Task.CoresNeeded <= slave.FreeCores
                        && ar.Task.MemoryNeeded <= slave.FreeMemory
-                    orderby ar.Task.Priority descending, db.Random() // take random task to avoid the race condition that occurs when this method is called concurrently (the same task would be returned)
-                    select DT.Convert.ToDto(ar.Task);
-        var waitingTasks = (count == 0 ? query : query.Take(count)).ToArray();
+                    select new TaskInfoForScheduler() { TaskId = ar.Task.TaskId, JobId = ar.Task.JobId, Priority = ar.Task.Priority };
+        var waitingTasks = query.ToArray();
         return waitingTasks;
       });
@@ -178 +239 @@
     public DT.Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception) {
       return ExecuteWithContext<DT.Task>((db) => {
-        var job = db.Tasks.SingleOrDefault(x => x.TaskId == taskId);
-        job.State = taskState;
+        db.DeferredLoadingEnabled = false;
+        var task = db.Tasks.SingleOrDefault(x => x.TaskId == taskId);
+        task.State = taskState;
         db.StateLogs.InsertOnSubmit(new StateLog {
           TaskId = taskId,
@@ -189 +251 @@
         });
         db.SubmitChanges();
-        job = db.Tasks.SingleOrDefault(x => x.TaskId == taskId);
-        return DT.Convert.ToDto(job);
+        task = db.Tasks.SingleOrDefault(x => x.TaskId == taskId);
+        return DT.Convert.ToDto(task);
       });
     }
@@ -299 +361 @@
     }
 
+    public IEnumerable<JobInfoForScheduler> GetJobInfoForScheduler(Expression<Func<Job, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.Jobs.Where(predicate).Select(x => new JobInfoForScheduler() { Id = x.JobId, DateCreated = x.DateCreated, OwnerUserId = x.OwnerUserId }).ToArray();
+      }
+    }
+
     public Guid AddJob(DT.Job dto) {
       return ExecuteWithContext<Guid>((db) => {
         var entity = DT.Convert.ToEntity(dto);
         db.Jobs.InsertOnSubmit(entity);
+        if (!db.UserPriorities.Any(x => x.UserId == dto.OwnerUserId))
+          EnqueueUserPriority(new DT.UserPriority { Id = dto.OwnerUserId, DateEnqueued = dto.DateCreated });
         db.SubmitChanges();
         return entity.JobId;
@@ -374 +444 @@
             // not allowed, delete
             db.JobPermissions.DeleteOnSubmit(jobPermission);
-          }
-          else {
+          } else {
             // update
             jobPermission.Permission = permission;
             jobPermission.GrantedByUserId = grantedByUserId; // update grantedByUserId, always the last "granter" is stored
           }
-        }
-        else {
+        } else {
           // insert
           if (permission != Permission.NotAllowed) {
@@ -441 +509 @@
 
     public IEnumerable<DT.PluginData> GetPluginDatas(Expression<Func<PluginData, bool>> predicate) {
-      return ExecuteWithContext <IEnumerable<DT.PluginData>>((db) => {
+      return ExecuteWithContext<IEnumerable<DT.PluginData>>((db) => {
         return db.PluginDatas.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
       });
@@ -599 +667 @@
     }
 
-    public void AssignJobToResource(Guid jobId, Guid resourceId) {
-      ExecuteWithContext((db) => {
-        var job = db.Tasks.Where(x => x.TaskId == jobId).Single();
-        job.AssignedResources.Add(new AssignedResource() { TaskId = jobId, ResourceId = resourceId });
+    public void AssignJobToResource(Guid taskId, IEnumerable<Guid> resourceIds) {
+      ExecuteWithContext((db) => {
+        db.DeferredLoadingEnabled = false;
+
+        List<AssignedResource> assignedResources = new List<AssignedResource>();
+        foreach (Guid rId in resourceIds) {
+          assignedResources.Add(new AssignedResource() { TaskId = taskId, ResourceId = rId });
+        }
+        db.AssignedResources.InsertAllOnSubmit(assignedResources);
         db.SubmitChanges();
       });
@@ -608 +681 @@
 
     public IEnumerable<DT.Resource> GetAssignedResources(Guid jobId) {
-      return ExecuteWithContext <IEnumerable<DT.Resource>>((db) => {
+      return ExecuteWithContext<IEnumerable<DT.Resource>>((db) => {
         var job = db.Tasks.Where(x => x.TaskId == jobId).Single();
         return job.AssignedResources.Select(x => DT.Convert.ToDto(x.Resource)).ToArray();
@@ -636 +709 @@
     public IEnumerable<DT.Resource> GetChildResources(Guid resourceId) {
       return ExecuteWithContext<IEnumerable<DT.Resource>>((db) => {
-        var childs = new List<DT.Resource>();
-        foreach (var child in db.Resources.Where(x => x.ParentResourceId == resourceId)) {
-          childs.Add(DT.Convert.ToDto(child));
-          childs.AddRange(GetChildResources(child.ResourceId));
-        }
-        return childs;
-      });
+        return CollectChildResources(resourceId, db);
+      });
+    }
+
+    public IEnumerable<DT.Resource> CollectChildResources(Guid resourceId, HiveDataContext db) {
+      var childs = new List<DT.Resource>();
+      foreach (var child in db.Resources.Where(x => x.ParentResourceId == resourceId)) {
+        childs.Add(DT.Convert.ToDto(child));
+        childs.AddRange(CollectChildResources(child.ResourceId, db));
+      }
+      return childs;
     }
 
@@ -661 +738 @@
     #region ResourcePermission Methods
     public DT.ResourcePermission GetResourcePermission(Guid resourceId, Guid grantedUserId) {
-      return ExecuteWithContext <DT.ResourcePermission> ((db) => {
+      return ExecuteWithContext<DT.ResourcePermission>((db) => {
         return DT.Convert.ToDto(db.ResourcePermissions.SingleOrDefault(x => x.ResourceId == resourceId && x.GrantedUserId == grantedUserId));
       });
@@ -734 +811 @@
         if (entity != null) {
           entity.LastCleanup = datetime;
-        }
-        else {
+        } else {
           entity = new Lifecycle();
           entity.LifecycleId = 0; // always only one entry with ID:0
@@ -825 +901 @@
         db.SubmitChanges();
       });
+    }
+
+    public Dictionary<Guid, int> GetWaitingTasksByUser() {
+      using (var db = CreateContext()) {
+        var waitingTasksByUser = from task in db.Tasks
+                                 where task.State == TaskState.Waiting
+                                 group task by task.Job.OwnerUserId into g
+                                 select new { UserId = g.Key, UsedCores = g.Count() };
+        return waitingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
+    public Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds) {
+      using (var db = CreateContext()) {
+        var waitingTasksByUser = from task in db.Tasks
+                                 where task.State == TaskState.Waiting && task.AssignedResources.Any(x => resourceIds.Contains(x.ResourceId))
+                                 group task by task.Job.OwnerUserId into g
+                                 select new { UserId = g.Key, UsedCores = g.Count() };
+        return waitingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
+    public Dictionary<Guid, int> GetCalculatingTasksByUser() {
+      using (var db = CreateContext()) {
+        var calculatingTasksByUser = from task in db.Tasks
+                                     where task.State == TaskState.Calculating
+                                     group task by task.Job.OwnerUserId into g
+                                     select new { UserId = g.Key, UsedCores = g.Count() };
+        return calculatingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
+    }
+
+    public Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds) {
+      using (var db = CreateContext()) {
+        var calculatingTasksByUser = from task in db.Tasks
+                                     where task.State == TaskState.Calculating && task.AssignedResources.Any(x => resourceIds.Contains(x.ResourceId))
+                                     group task by task.Job.OwnerUserId into g
+                                     select new { UserId = g.Key, UsedCores = g.Count() };
+        return calculatingTasksByUser.ToDictionary(x => x.UserId, x => x.UsedCores);
+      }
     }
 
@@ -904 +1020 @@
     #endregion
 
+    #region UserPriority Methods
+    public IEnumerable<DT.UserPriority> GetUserPriorities(Expression<Func<UserPriority, bool>> predicate) {
+      using (var db = CreateContext()) {
+        return db.UserPriorities.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();
+      }
+    }
+
+    public void EnqueueUserPriority(DT.UserPriority dto) {
+      using (var db = CreateContext()) {
+        var entity = db.UserPriorities.FirstOrDefault(x => x.UserId == dto.Id);
+        if (entity == null) db.UserPriorities.InsertOnSubmit(DT.Convert.ToEntity(dto));
+        else DT.Convert.ToEntity(dto, entity);
+        db.SubmitChanges();
+      }
+    }
+    #endregion
+
     #region Helpers
     private void CollectChildTasks(HiveDataContext db, Guid parentTaskId, List<Task> collection) {

branches/OaaS/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -24 +24 @@
 using System.Linq;
 using System.ServiceModel;
+using System.Transactions;
 using HeuristicLab.Services.Hive.DataTransfer;
 using HeuristicLab.Services.Hive.ServiceContracts;
 using DA = HeuristicLab.Services.Hive.DataAccess;
 using DT = HeuristicLab.Services.Hive.DataTransfer;
-using System.Transactions;
 
 
@@ -69 +69 @@
         taskData.TaskId = task.Id;
         taskData.LastUpdate = DateTime.Now;
-        foreach (Guid slaveGroupId in resourceIds) {
-          dao.AssignJobToResource(task.Id, slaveGroupId);
-        }
+        dao.AssignJobToResource(task.Id, resourceIds);
         dao.AddTaskData(taskData);
         dao.UpdateTaskState(task.Id, DA.TaskState.Waiting, null, currentUserId, null);
@@ -82 +80 @@
       var assignedResources = dao.GetAssignedResources(parentTaskId).Select(x => x.Id);
       task.ParentTaskId = parentTaskId;
-      return AddTask(task, taskData, assignedResources);      
+      return AddTask(task, taskData, assignedResources);
     }
 
@@ -132 +130 @@
 
       return trans.UseTransaction(() => {
-        return dao.GetTasks(x => x.JobId == jobId).Select(x => new LightweightTask(x)).ToArray();
+        return dao.GetLightweightTasks(task => task.JobId == jobId).ToArray();
+      }, false, true);
+    }
+
+    public IEnumerable<LightweightTask> GetLightweightJobTasksWithoutStateLog(Guid jobId) {
+      authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      author.AuthorizeForJob(jobId, Permission.Read);
+
+      return trans.UseTransaction(() => {
+        return dao.GetLightweightTasksWithoutStateLog(task => task.JobId == jobId).ToArray();
       }, false, false);
     }
@@ -145 +152 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForTask(taskDto.Id, Permission.Full);
-      trans.UseTransaction(() => {
-        dao.UpdateTask(taskDto);
+
+      trans.UseTransaction(() => {
+        dao.UpdateTaskAndPlugins(taskDto);
       });
     }
@@ -153 +161 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave);
       author.AuthorizeForTask(task.Id, Permission.Full);
-      author.AuthorizeForTask(taskData.TaskId, Permission.Full);
-      //trans.UseTransaction(() => { // cneumuel: try without transaction
+      dao.UpdateTaskAndPlugins(task);
       taskData.LastUpdate = DateTime.Now;
-      dao.UpdateTask(task);
       dao.UpdateTaskData(taskData);
-      //}, false, true);
     }
 
@@ -200 +205 @@
         }
 
-        dao.UpdateTask(task);
+        dao.UpdateTaskAndPlugins(task);
         return task;
       });
@@ -412 +417 @@
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
 
-      //TODO: enable transaction
-      //List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
-      List<MessageContainer> result = heartbeatManager.ProcessHeartbeat(heartbeat);
+      List<MessageContainer> result = new List<MessageContainer>();
+      try {
+        result = heartbeatManager.ProcessHeartbeat(heartbeat);
+      }
+      catch (Exception ex) {
+        DA.LogFactory.GetLogger(this.GetType().Namespace).Log("Exception processing Heartbeat: " + ex.ToString());
+      }
 
       if (HeuristicLab.Services.Hive.Properties.Settings.Default.TriggerEventManagerInHeartbeat) {
@@ -517 +526 @@
     #endregion
 
+    #region Resource Methods
+    public IEnumerable<Resource> GetChildResources(Guid resourceId) {
+      return trans.UseTransaction(() => { return dao.GetChildResources(resourceId); });
+    }
+    #endregion
+
     #region Slave Methods
     public int GetNewHeartbeatInterval(Guid slaveId) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      Slave s = dao.GetSlave(slaveId);
+
+      Slave s = trans.UseTransaction(() => { return dao.GetSlave(slaveId); });
       if (s != null) {
         return s.HbInterval;
@@ -689 +705 @@
     #endregion
 
+    #region UserPriority Methods
+    public IEnumerable<UserPriority> GetUserPriorities() {
+      return trans.UseTransaction(() => dao.GetUserPriorities(x => true));
+    }
+    #endregion
+
     #region Helper Methods
     private IEnumerable<Task> GetChildTasks(Guid? parentTaskId, bool recursive, bool includeParent) {
@@ -705 +727 @@
     }
     #endregion
+
+    #region Statistics Methods
+    public IEnumerable<Statistics> GetStatistics() {
+      return trans.UseTransaction(() => { return dao.GetStatistics(x => true); });
+    }
+    public IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to) {
+      return trans.UseTransaction(() => { return dao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to); });
+    }
+    #endregion
   }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs

@@ -31 +31 @@
     DT.Task GetTask(Guid id);
     IEnumerable<DT.Task> GetTasks(Expression<Func<Task, bool>> predicate);
+    IEnumerable<DT.LightweightTask> GetLightweightTasks(Expression<Func<Task, bool>> predicate);
+    IEnumerable<DT.LightweightTask> GetLightweightTasksWithoutStateLog(Expression<Func<Task, bool>> predicate);
     Guid AddTask(DT.Task dto);
+    void UpdateTaskAndPlugins(DT.Task dto);
+    void UpdateTaskAndStateLogs(DT.Task dto);
     void UpdateTask(DT.Task dto);
     void DeleteTask(Guid id);
-    IEnumerable<DT.Task> GetWaitingTasks(DT.Slave slave, int count);
+    IEnumerable<TaskInfoForScheduler> GetWaitingTasks(DT.Slave slave);
     IEnumerable<DT.Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished);
     DT.Task UpdateTaskState(Guid taskId, TaskState taskState, Guid? slaveId, Guid? userId, string exception);
@@ -58 +62 @@
     DT.Job GetJob(Guid id);
     IEnumerable<DT.Job> GetJobs(Expression<Func<Job, bool>> predicate);
+    IEnumerable<JobInfoForScheduler> GetJobInfoForScheduler(Expression<Func<Job, bool>> predicate);
     Guid AddJob(DT.Job dto);
     void UpdateJob(DT.Job dto);
@@ -110 +115 @@
     void UpdateResource(DT.Resource dto);
     void DeleteResource(Guid id);
-    void AssignJobToResource(Guid jobId, Guid resourceId);
+    void AssignJobToResource(Guid taskId, IEnumerable<Guid> resourceIds);
     IEnumerable<DT.Resource> GetAssignedResources(Guid jobId);
     IEnumerable<DT.Resource> GetParentResources(Guid resourceId);
@@ -145 +150 @@
 
     #region Statistics Methods
+    Dictionary<Guid, int> GetWaitingTasksByUser();
+    Dictionary<Guid, int> GetWaitingTasksByUserForResources(List<Guid> resourceIds);
+    Dictionary<Guid, int> GetCalculatingTasksByUser();
+    Dictionary<Guid, int> GetCalculatingTasksByUserForResources(List<Guid> resourceIds);
     DT.Statistics GetStatistic(Guid id);
     IEnumerable<DT.Statistics> GetStatistics(Expression<Func<Statistics, bool>> predicate);
@@ -151 +160 @@
     List<DT.UserStatistics> GetUserStatistics();
     #endregion
+
+    #region UserPriority Methods
+    IEnumerable<DT.UserPriority> GetUserPriorities(Expression<Func<UserPriority, bool>> predicate);
+    void EnqueueUserPriority(DT.UserPriority userPriority);
+    #endregion
   }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs

@@ -31 +31 @@
     Access.IUserManager UserManager { get; }
     HeartbeatManager HeartbeatManager { get; }
+    ITaskScheduler TaskScheduler { get; }
   }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Services.Hive.DataTransfer;
 using DA = HeuristicLab.Services.Hive.DataAccess;
@@ -28 +29 @@
 namespace HeuristicLab.Services.Hive {
   public class HeartbeatManager {
+    private const string MutexName = "HiveTaskSchedulingMutex";
+
     private IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
     }
-    private IAuthorizationManager auth {
-      get { return ServiceLocator.Instance.AuthorizationManager; }
+    private ITaskScheduler taskScheduler {
+      get { return ServiceLocator.Instance.TaskScheduler; }
+    }
+    private DataAccess.ITransactionManager trans {
+      get { return ServiceLocator.Instance.TransactionManager; }
     }
 
@@ -41 +47 @@
     public List<MessageContainer> ProcessHeartbeat(Heartbeat heartbeat) {
       List<MessageContainer> actions = new List<MessageContainer>();
-      Slave slave = dao.GetSlave(heartbeat.SlaveId);
+      Slave slave = null;
+      slave = trans.UseTransaction(() => { return dao.GetSlave(heartbeat.SlaveId); });
+
       if (slave == null) {
         actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
@@ -47 +55 @@
         if (heartbeat.HbInterval != slave.HbInterval) {
           actions.Add(new MessageContainer(MessageContainer.MessageType.NewHBInterval));
+        }
+        if (ShutdownSlaveComputer(slave.Id)) {
+          actions.Add(new MessageContainer(MessageContainer.MessageType.ShutdownComputer));
         }
 
@@ -56 +67 @@
         slave.SlaveState = (heartbeat.JobProgress != null && heartbeat.JobProgress.Count > 0) ? SlaveState.Calculating : SlaveState.Idle;
         slave.LastHeartbeat = DateTime.Now;
-        dao.UpdateSlave(slave);
+
+        trans.UseTransaction(() => { dao.UpdateSlave(slave); });
 
         // update task data
@@ -63 +75 @@
         // assign new task
         if (heartbeat.AssignJob && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
-          var availableJobs = dao.GetWaitingTasks(slave, 1);
-          if (availableJobs.Count() > 0) {
-            var job = availableJobs.First();
-            if (AssignJob(slave, job))
-              actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, job.Id));
+          bool mutexAquired = false;
+          var mutex = new Mutex(false, MutexName);
+          try {
+            mutexAquired = mutex.WaitOne(Properties.Settings.Default.SchedulingPatience);
+            if (!mutexAquired)
+              DA.LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager: The mutex used for scheduling could not be aquired.");
+            else {
+              IEnumerable<TaskInfoForScheduler> availableTasks = null;
+              availableTasks = trans.UseTransaction(() => { return taskScheduler.Schedule(dao.GetWaitingTasks(slave)); });
+              if (availableTasks.Any()) {
+                var task = availableTasks.First();
+                AssignJob(slave, task.TaskId);
+                actions.Add(new MessageContainer(MessageContainer.MessageType.CalculateTask, task.TaskId));
+              }
+            }
+          }
+          catch (AbandonedMutexException) {
+            DA.LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager: The mutex used for scheduling has been abandoned.");
+          }
+          catch (Exception ex) {
+            DA.LogFactory.GetLogger(this.GetType().Namespace).Log("HeartbeatManager threw an exception in ProcessHeartbeat: " + ex.ToString());
+          }
+          finally {
+            if (mutexAquired) mutex.ReleaseMutex();
           }
         }
@@ -74 +105 @@
     }
 
-    // returns true if assignment was successful
-    private bool AssignJob(Slave slave, Task task) {
-      // load task again and check if it is still available (this is an attempt to reduce the race condition which causes multiple heartbeats to get the same task assigned)
-      if (dao.GetTask(task.Id).State != TaskState.Waiting) return false;
+    private void AssignJob(Slave slave, Guid taskId) {
+      trans.UseTransaction(() => {
+        var task = dao.UpdateTaskState(taskId, DataAccess.TaskState.Transferring, slave.Id, null, null);
 
-      task = dao.UpdateTaskState(task.Id, DataAccess.TaskState.Transferring, slave.Id, null, null);
-
-      // from now on the task has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)
-      task.LastHeartbeat = DateTime.Now;
-      dao.UpdateTask(task);
-      return true;
+        // from now on the task has some time to send the next heartbeat (ApplicationConstants.TransferringJobHeartbeatTimeout)
+        task.LastHeartbeat = DateTime.Now;
+        dao.UpdateTask(task);
+      });
     }
 
@@ -102 +130 @@
         // process the jobProgresses
         foreach (var jobProgress in heartbeat.JobProgress) {
-          Task curTask = dao.GetTask(jobProgress.Key);
+          Task curTask = null;
+          curTask = trans.UseTransaction(() => { return dao.GetTask(jobProgress.Key); });
           if (curTask == null) {
             // task does not exist in db
@@ -131 +160 @@
                   break;
               }
-              dao.UpdateTask(curTask);
+              trans.UseTransaction(() => { dao.UpdateTask(curTask); });
             }
           }
@@ -140 +169 @@
 
     private bool TaskIsAllowedToBeCalculatedBySlave(Guid slaveId, Task curTask) {
-      var assignedResourceIds = dao.GetAssignedResources(curTask.Id).Select(x => x.Id);
-      var slaveResourceIds = dao.GetParentResources(slaveId).Select(x => x.Id);
-      return assignedResourceIds.Any(x => slaveResourceIds.Contains(x));
+      return trans.UseTransaction(() => {
+        var assignedResourceIds = dao.GetAssignedResources(curTask.Id).Select(x => x.Id);
+        var slaveResourceIds = dao.GetParentResources(slaveId).Select(x => x.Id);
+        return assignedResourceIds.Any(x => slaveResourceIds.Contains(x));
+      });
     }
 
     private bool SlaveIsAllowedToCalculate(Guid slaveId) {
       // the slave may only calculate if there is no downtime right now. this needs to be checked for every parent resource also
-      return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() == 0);
+      return trans.UseTransaction(() => { return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Offline && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() == 0); });
+    }
+
+    private bool ShutdownSlaveComputer(Guid slaveId) {
+      return trans.UseTransaction(() => { return dao.GetParentResources(slaveId).Any(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Shutdown && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() != 0); });
     }
   }

branches/OaaS/HeuristicLab.Services.Hive/3.3/MessageContainer.cs

@@ -48 +48 @@
       ShutdownSlave,  // slave should shutdown immediately without submitting results
       SayHello,  // Slave should say hello, because job is unknown to the server
-      NewHBInterval,
+      NewHBInterval, // change the polling to a new interval
+      ShutdownComputer, // shutdown the computer the slave runs on
     };
 

branches/OaaS/HeuristicLab.Services.Hive/3.3/Plugin.cs.frame

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive.Server {
-  [Plugin("HeuristicLab.Services.Hive", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Services.Hive", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Services.Hive-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/OaaS/HeuristicLab.Services.Hive/3.3/Properties/AssemblyInfo.cs.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/OaaS/HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -13 +13 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
@@ -77 +77 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
+        public global::System.TimeSpan SchedulingPatience {
+            get {
+                return ((global::System.TimeSpan)(this["SchedulingPatience"]));
+            }
+        }
     }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/Properties/Settings.settings

@@ -21 +21 @@
       <Value Profile="(Default)">3.00:00:00</Value>
     </Setting>
+    <Setting Name="SchedulingPatience" Type="System.TimeSpan" Scope="Application">
+      <Value Profile="(Default)">00:00:20</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/OaaS/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -53 +53 @@
 
     [OperationContract]
+    IEnumerable<LightweightTask> GetLightweightJobTasksWithoutStateLog(Guid jobId);
+
+    [OperationContract]
     TaskData GetTaskData(Guid taskId);
 
@@ -168 +171 @@
     #endregion
 
+    #region Resource Methods
+    [OperationContract]
+    IEnumerable<Resource> GetChildResources(Guid resourceId);
+    #endregion
+
     #region Slave Methods
     [OperationContract]
@@ -238 +246 @@
     [OperationContract]
     Guid GetUserIdByUsername(string username);
+    #endregion
+
+    #region UserPriorities Methods
+    [OperationContract]
+    IEnumerable<UserPriority> GetUserPriorities();
+    #endregion
+
+    #region Statistics Methods
+    [OperationContract]
+    IEnumerable<Statistics> GetStatistics();
+    [OperationContract]
+    IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to);
     #endregion
   }

branches/OaaS/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -98 +98 @@
       }
     }
+
+    private ITaskScheduler taskScheduler;
+    public ITaskScheduler TaskScheduler {
+      get {
+        if (taskScheduler == null) taskScheduler = new RoundRobinTaskScheduler();
+        return taskScheduler;
+      }
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Hive/3.3/Settings.cs

@@ -1 @@
-namespace HeuristicLab.Services.Hive.Properties {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace HeuristicLab.Services.Hive.Properties {
     
     

branches/OaaS/HeuristicLab.Services.Hive/3.3/app.config

@@ -26 +26 @@
                 <value>3.00:00:00</value>
             </setting>
+            <setting name="SchedulingPatience" serializeAs="String">
+                <value>00:00:20</value>
+            </setting>
         </HeuristicLab.Services.Hive.Properties.Settings>
     </applicationSettings>

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages