Changeset 8687 for branches/HiveTaskScheduler/HeuristicLab.Services.Hive

Timestamp:

09/24/12 15:24:24 (12 years ago)

Author:

jkarder

Message:

#1712: initial commit

Location:

branches/HiveTaskScheduler

Files:

• . (added)
• HeuristicLab.Services.Hive (copied) (copied from trunk/sources/HeuristicLab.Services.Hive)
• HeuristicLab.Services.Hive/3.3/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/DataTransfer/UserPriority.cs (added)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/ITaskScheduler.cs (added)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Scheduler (added)
• HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs (added)
• HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (1 diff)

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

@@ -527 +527 @@
     }
     #endregion
+
+    #region UserPriority
+    public static DT.UserPriority ToDto(DB.UserPriority source) {
+      if (source == null) return null;
+      return new DT.UserPriority() { UserId = source.UserId };
+    }
+    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.UserId;
+      }
+    }
+    #endregion
   }
 }

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

@@ -114 +114 @@
     <Compile Include="Convert.cs" />
     <Compile Include="DataTransfer\Command.cs" />
+    <Compile Include="DataTransfer\UserPriority.cs" />
     <Compile Include="DataTransfer\ResourcePermission.cs" />
     <Compile Include="DataTransfer\Downtime.cs" />
@@ -139 +140 @@
     <Compile Include="HiveJanitor.cs" />
     <Compile Include="Interfaces\IHiveDao.cs" />
+    <Compile Include="Interfaces\ITaskScheduler.cs" />
+    <Compile Include="Scheduler\RoundRobinTaskScheduler.cs" />
     <Compile Include="Settings.cs" />
     <None Include="app.config" />
@@ -196 +199 @@
   </PropertyGroup>
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -202 +205 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

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

@@ -112 +112 @@
     }
 
-    public IEnumerable<DT.Task> GetWaitingTasks(DT.Slave slave, int count) {
+    public IEnumerable<DT.Task> GetWaitingTasks(DT.Slave slave) {
       using (var db = CreateContext()) {
         var resourceIds = GetParentResources(slave.Id).Select(r => r.Id);
@@ -127 +127 @@
                     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();
+        var waitingTasks = query.ToArray();
         return waitingTasks;
       }
@@ -857 +857 @@
     #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();
+      }
+    }
+    #endregion
+
     #region Helpers
     private void CollectChildTasks(HiveDataContext db, Guid parentTaskId, List<Task> collection) {

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

@@ -499 +499 @@
     #endregion
 
+    #region Resource Methods
+    public IEnumerable<Resource> GetChildResources(Guid resourceId) {
+      return dao.GetChildResources(resourceId);
+    }
+    #endregion
+
     #region Slave Methods
     public int GetNewHeartbeatInterval(Guid slaveId) {
@@ -671 +677 @@
     #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) {
@@ -687 +699 @@
     }
     #endregion
+
+    #region Statistics Methods
+    public IEnumerable<Statistics> GetStatistics() {
+      return dao.GetStatistics(x => true);
+    }
+    public IEnumerable<Statistics> GetStatisticsForTimePeriod(DateTime from, DateTime to) {
+      return dao.GetStatistics(x => x.Timestamp >= from && x.Timestamp <= to);
+    }
+    #endregion
   }
 }

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

@@ -34 +34 @@
     void UpdateTask(DT.Task dto);
     void DeleteTask(Guid id);
-    IEnumerable<DT.Task> GetWaitingTasks(DT.Slave slave, int count);
+    IEnumerable<DT.Task> 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);
@@ -151 +151 @@
     List<DT.UserStatistics> GetUserStatistics();
     #endregion
+
+    #region UserPriority Methods
+    IEnumerable<DT.UserPriority> GetUserPriorities(Expression<Func<UserPriority, bool>> predicate);
+    #endregion
   }
 }

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

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

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

@@ -31 +31 @@
       get { return ServiceLocator.Instance.HiveDao; }
     }
-    private IAuthorizationManager auth {
-      get { return ServiceLocator.Instance.AuthorizationManager; }
+    private ITaskScheduler taskScheduler {
+      get { return ServiceLocator.Instance.TaskScheduler; }
     }
 
@@ -63 +63 @@
         // assign new task
         if (heartbeat.AssignJob && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
-          var availableJobs = dao.GetWaitingTasks(slave, 1);
-          if (availableJobs.Count() > 0) {
+          var availableJobs = taskScheduler.Schedule(dao.GetWaitingTasks(slave));
+          if (availableJobs.Any()) {
             var job = availableJobs.First();
             if (AssignJob(slave, job))

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

@@ -168 +168 @@
     #endregion
 
+    #region Resource Methods
+    [OperationContract]
+    IEnumerable<Resource> GetChildResources(Guid resourceId);
+    #endregion
+
     #region Slave Methods
     [OperationContract]
@@ -238 +243 @@
     [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/HiveTaskScheduler/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

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